Changeset 446

Timestamp:

07/15/2005 01:26:16 PM (3 years ago)

Author:

jan

Message:

made errorfile-prefix conditional

Location:

branches/lighttpd-1.3.x/src

Files:

• base.h (modified) (2 diffs)
• config.c (modified) (6 diffs)
• connections.c (modified) (1 diff)
• server.c (modified) (2 diffs)

branches/lighttpd-1.3.x/src/base.h

@@ -225 +225 @@
         buffer *dirlist_css;
         buffer *dirlist_encoding;
+        buffer *errorfile_prefix;
         
         unsigned short dir_listing;
@@ -408 +409 @@
         buffer *groupname;
         
-        buffer *errorfile_prefix;
         buffer *license;
         buffer *pid_file;

branches/lighttpd-1.3.x/src/config.c

@@ -94 +94 @@
         cv[0].destination = srv->srvconf.bindhost;
         cv[1].destination = srv->srvconf.error_logfile;
-        cv[2].destination = srv->srvconf.errorfile_prefix;
         cv[3].destination = srv->srvconf.changeroot;
         cv[4].destination = srv->srvconf.username;
@@ -128 +127 @@
                 s->error_handler = buffer_init();
                 s->server_tag    = buffer_init();
+                s->errorfile_prefix = buffer_init();
                 s->dirlist_css   = buffer_init();
                 s->dirlist_encoding = buffer_init();
@@ -143 +143 @@
                 s->global_bytes_per_second_cnt = 0;
                 s->global_bytes_per_second_cnt_ptr = &s->global_bytes_per_second_cnt;
+                
+                cv[2].destination = s->errorfile_prefix;
                 
                 cv[7].destination = s->server_tag;
@@ -209 +211 @@
         PATCH(use_xattr);
         PATCH(error_handler);
+        PATCH(errorfile_prefix);
         PATCH(follow_symlink);
         PATCH(server_tag);
@@ -214 +217 @@
         PATCH(global_kbytes_per_second);
         PATCH(global_bytes_per_second_cnt);
+        
         con->conf.global_bytes_per_second_cnt_ptr = &s->global_bytes_per_second_cnt;
         buffer_copy_string_buffer(con->server_name, s->server_name);
@@ -255 +259 @@
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.error-handler-404"))) {
                                 PATCH(error_handler);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.errorfi"))) {
+                                PATCH(errorfile_prefix);
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.indexfiles"))) {
                                 PATCH(indexfiles);

branches/lighttpd-1.3.x/src/connections.c

@@ -323 +323 @@
                         buffer_reset(con->physical.path);
                         
-                        if (srv->srvconf.errorfile_prefix->used) {
-                                buffer_copy_string_buffer(con->physical.path, srv->srvconf.errorfile_prefix);
+                        if (con->conf.errorfile_prefix->used) {
+                                buffer_copy_string_buffer(con->physical.path, con->conf.errorfile_prefix);
                                 buffer_append_string(con->physical.path, get_http_status_body_name(con->http_status));
                         }

branches/lighttpd-1.3.x/src/server.c

@@ -137 +137 @@
         CLEAN(srvconf.changeroot);
         CLEAN(srvconf.bindhost);
-        CLEAN(srvconf.errorfile_prefix);
         CLEAN(srvconf.license);
         CLEAN(srvconf.event_handler);
@@ -217 +216 @@
         CLEAN(srvconf.changeroot);
         CLEAN(srvconf.bindhost);
-        CLEAN(srvconf.errorfile_prefix);
         CLEAN(srvconf.license);
         CLEAN(srvconf.event_handler);