Skip to content
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@2846 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
1 parent b1254ef commit a0965648ae9db668007cc5bdff368032c7838ab8 @alobbs alobbs committed Feb 6, 2009
Showing with 10 additions and 4 deletions.
  1. +4 −0 ChangeLog
  2. +3 −3 cherokee.conf.sample.pre
  3. +3 −1 cherokee/handler_dirlist.c
View
4 ChangeLog
@@ -1,5 +1,9 @@
2009-02-06 Alvaro Lopez Ortega <alvaro@octality.com>
+ * cherokee.conf.sample.pre, cherokee/handler_dirlist.c: Fixes an
+ internal path issue. Antonio and Stefan!
+ http://code.google.com/p/cherokee/issues/detail?id=342 Thanks
+
* cherokee/thread.c, cherokee/connection.h,
cherokee/connection.c (cherokee_connection_create_encoder): Fixes
a compilation issue.
View
6 cherokee.conf.sample.pre
@@ -38,16 +38,16 @@ vserver!1!rule!1!handler!iocache = 0
vserver!1!rule!2!match = directory
vserver!1!rule!2!match!directory = /icons
vserver!1!rule!2!handler = file
-vserver!1!rule!2!document_root = %prefix%/share/cherokee/icons/
+vserver!1!rule!2!document_root = %prefix%/share/cherokee/icons
vserver!1!rule!3!match = directory
vserver!1!rule!3!match!directory = /cherokee_themes
-vserver!1!rule!3!document_root = %prefix%/share/cherokee/themes/
+vserver!1!rule!3!document_root = %prefix%/share/cherokee/themes
vserver!1!rule!3!handler = file
vserver!1!rule!4!match = directory
vserver!1!rule!4!match!directory = /cgi-bin
-vserver!1!rule!4!document_root = %prefix%/lib/cgi-bin/
+vserver!1!rule!4!document_root = %prefix%/lib/cgi-bin
vserver!1!rule!4!handler = cgi
vserver!1!rule!5!match = directory
View
4 cherokee/handler_dirlist.c
@@ -50,7 +50,7 @@
#include "common.h"
#include "human_strcmp.h"
-#define ICON_WEB_DIR_DEFAULT "/icons/"
+#define ICON_WEB_DIR_DEFAULT "/icons"
struct file_entry {
@@ -830,6 +830,7 @@ render_file (cherokee_handler_dirlist_t *dhdl, cherokee_buffer_t *buffer, file_e
if (icon) {
cherokee_buffer_clean (tmp);
cherokee_buffer_add_buffer (tmp, &props->icon_web_dir);
+ cherokee_buffer_add_char (tmp, '/');
cherokee_buffer_add_buffer (tmp, icon);
VTMP_SUBSTITUTE_TOKEN ("%icon%", tmp->buf);
} else {
@@ -938,6 +939,7 @@ render_parent_directory (cherokee_handler_dirlist_t *dhdl, cherokee_buffer_t *bu
if (icon) {
cherokee_buffer_clean (tmp);
cherokee_buffer_add_buffer (tmp, &props->icon_web_dir);
+ cherokee_buffer_add_char (tmp, '/');
cherokee_buffer_add_buffer (tmp, icon);
VTMP_SUBSTITUTE_TOKEN ("%icon%", tmp->buf);
} else {

0 comments on commit a096564

Please sign in to comment.
Something went wrong with that request. Please try again.