The patches were not applied like there were supposed to be! Also improve initd to...

Package-Manager: portage-2.1.2_rc4-r6

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index ee38c08e4c251793cf536acbbda9ac036ef57730..c34bc74a848108ae7ff2feff621b34858910fd35 100644 (file)
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -22,18 +22,18 @@ AUX 1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353 RMD160 d6beacffdba06fba
 MD5 0ce285405a1c07a6f7cf2905a056f299 files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353
 RMD160 d6beacffdba06fbaeabc0310765c39d8a23047ad files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353
 SHA256 67ce14b3f41f37c22e75fe897f2bfa427cfc1bacd4df72d1e7f73929b0ebce70 files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353
-AUX 1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263 RMD160 ea424d080a74a2cdc871838593982576795c52e1 SHA1 69587463e4f056b61cc871d8f060cc6494f1c9e1 SHA256 3a51f64094827e4536fa68e18c7428346c9965b8975a8cc11c7f9e7e895bf023
-MD5 5d187fb7f7a6e016319418fd38b1fda0 files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263
-RMD160 ea424d080a74a2cdc871838593982576795c52e1 files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263
-SHA256 3a51f64094827e4536fa68e18c7428346c9965b8975a8cc11c7f9e7e895bf023 files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263
-AUX 1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087 RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f SHA1 877d864fbc6abf39f48a7bb29de809437298f158 SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848
-MD5 b2e5994810ffd6ad28fa31cc386674c0 files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087
-RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087
-SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848 files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087
-AUX 1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267 RMD160 d835aea73d87626240970d946b33663b510c2cd5 SHA1 69e289cd7c167507ca86c1f37b13480623666b55 SHA256 ea327f316cfebe2b7269bf48700453506e412e7bd0e7243e2f1e15ee2c5e7a89
-MD5 99d59d7e470f9057c2f836ca774fcd48 files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267
-RMD160 d835aea73d87626240970d946b33663b510c2cd5 files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267
-SHA256 ea327f316cfebe2b7269bf48700453506e412e7bd0e7243e2f1e15ee2c5e7a89 files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267
+AUX 1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295 RMD160 412d2871c7a0bdff71543e4c3a3f4fb975968536 SHA1 70d073ea4ef1dfabbe74b8ae5ade735a59e44fc2 SHA256 97330f9b6f81b351839a9c68391e55726c26dc9d47793311f04dfba39d8bfff9
+MD5 c990dd57e491c3df9bd685e4d8b1e40f files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295
+RMD160 412d2871c7a0bdff71543e4c3a3f4fb975968536 files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295
+SHA256 97330f9b6f81b351839a9c68391e55726c26dc9d47793311f04dfba39d8bfff9 files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295
+AUX 1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087 RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f SHA1 877d864fbc6abf39f48a7bb29de809437298f158 SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848
+MD5 b2e5994810ffd6ad28fa31cc386674c0 files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087
+RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087
+SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848 files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087
+AUX 1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 SHA1 22e0d05d49cecb652d1250ac66de13fdf228cce4 SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4
+MD5 34d6720749f96327d311661a02886a65 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
+RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
+SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
 AUX conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 SHA1 16922786a79807fa3233d1af105a99582d3486a5 SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd
 MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182
 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 files/conf/lighttpd.conf 8182
@@ -78,10 +78,10 @@ AUX lighttpd.initd 1164 RMD160 5db761cd95781c457035a0b03459c22554b54dab SHA1 ee4
 MD5 063fe5cdf400eebf73c263188f76f03e files/lighttpd.initd 1164
 RMD160 5db761cd95781c457035a0b03459c22554b54dab files/lighttpd.initd 1164
 SHA256 823ed1ae9b0dde0939285761b8af547116c51b597c1488dbd3f45a934e291213 files/lighttpd.initd 1164
-AUX lighttpd.initd-1.4.13-r1 1645 RMD160 bbe1d1c48ca1d19333e95920f77672f8c6ca224e SHA1 1d28579db73f3fd9a8cf8992e2fdc63e8d5655ea SHA256 0b196a26796693256d8f5a04739d981509aae17445dc81304a6b26014158c438
-MD5 bab08022d65188a60d02d7ae272eea32 files/lighttpd.initd-1.4.13-r1 1645
-RMD160 bbe1d1c48ca1d19333e95920f77672f8c6ca224e files/lighttpd.initd-1.4.13-r1 1645
-SHA256 0b196a26796693256d8f5a04739d981509aae17445dc81304a6b26014158c438 files/lighttpd.initd-1.4.13-r1 1645
+AUX lighttpd.initd-1.4.13-r1 1641 RMD160 b038e21964d92a1c3bd9d99b676c0d25b76087f0 SHA1 b31368f70854acccd44b5d9a4b87d4fb07920e78 SHA256 3eeaef628418745207ad4bb77dfbc378ff31f52dbc5413d19647303d5ad27d71
+MD5 5afc28fbed9597270f6eab8ef153b859 files/lighttpd.initd-1.4.13-r1 1641
+RMD160 b038e21964d92a1c3bd9d99b676c0d25b76087f0 files/lighttpd.initd-1.4.13-r1 1641
+SHA256 3eeaef628418745207ad4bb77dfbc378ff31f52dbc5413d19647303d5ad27d71 files/lighttpd.initd-1.4.13-r1 1641
 AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
 MD5 ad091c9157134890499f26d170352c9f files/lighttpd.logrotate 487
 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c files/lighttpd.logrotate 487
@@ -105,18 +105,18 @@ EBUILD lighttpd-1.4.11.ebuild 5433 RMD160 15516a26053769cfd979bbc170688bcc231b7d
 MD5 29011edc4969d9601390836b3cab781b lighttpd-1.4.11.ebuild 5433
 RMD160 15516a26053769cfd979bbc170688bcc231b7d5e lighttpd-1.4.11.ebuild 5433
 SHA256 ed8d1062e31147f5d4f8813c0d9e8c684db1c6597916565aebf0f32d3220c6f5 lighttpd-1.4.11.ebuild 5433
-EBUILD lighttpd-1.4.13-r1.ebuild 5527 RMD160 c7814ac24584cc975a0fb40c7af4044fd05209a7 SHA1 ea5218dbd04f9a7bea208e2409f72829f456b378 SHA256 f297620c2ef03e9f1ca7a256c213f969002c53609a918a2f59d12933a086bca8
-MD5 eefa971808e8eececcd67052c5646c34 lighttpd-1.4.13-r1.ebuild 5527
-RMD160 c7814ac24584cc975a0fb40c7af4044fd05209a7 lighttpd-1.4.13-r1.ebuild 5527
-SHA256 f297620c2ef03e9f1ca7a256c213f969002c53609a918a2f59d12933a086bca8 lighttpd-1.4.13-r1.ebuild 5527
+EBUILD lighttpd-1.4.13-r1.ebuild 5548 RMD160 ea232176123c46af71cd89f62689f7883702e17a SHA1 7ec964ff2b41d58df899f3714b8a249ad37945e3 SHA256 0e78467d7ff0273819ea1efd1a2b178df0f301e5afd54e305815ffd23d950f47
+MD5 9b3c739546575aff73455f454d419741 lighttpd-1.4.13-r1.ebuild 5548
+RMD160 ea232176123c46af71cd89f62689f7883702e17a lighttpd-1.4.13-r1.ebuild 5548
+SHA256 0e78467d7ff0273819ea1efd1a2b178df0f301e5afd54e305815ffd23d950f47 lighttpd-1.4.13-r1.ebuild 5548
 EBUILD lighttpd-1.4.13.ebuild 5459 RMD160 081507355b35012248bd85ccb42d97ace3c87dd8 SHA1 5adb04d1e47d3c31041a16bc02443375213d302b SHA256 20336448c4a291a7371661cae73153c50fa575b898056191bc80cf02a1feb475
 MD5 6934f5d5ec6ee1a6b6a85845c9f30f34 lighttpd-1.4.13.ebuild 5459
 RMD160 081507355b35012248bd85ccb42d97ace3c87dd8 lighttpd-1.4.13.ebuild 5459
 SHA256 20336448c4a291a7371661cae73153c50fa575b898056191bc80cf02a1feb475 lighttpd-1.4.13.ebuild 5459
-MISC ChangeLog 26065 RMD160 0a2c540ad4c36db2791c41b4301cf7bc5d818eca SHA1 e6328089957e13d5535022f7549cbd169d43402a SHA256 addb967473249577e0e2f99131cb843dbbec2825fc537b14e0d171f94f66c931
-MD5 1e1aa07c67f695a5b4d9cb1fb7cf5603 ChangeLog 26065
-RMD160 0a2c540ad4c36db2791c41b4301cf7bc5d818eca ChangeLog 26065
-SHA256 addb967473249577e0e2f99131cb843dbbec2825fc537b14e0d171f94f66c931 ChangeLog 26065
+MISC ChangeLog 26627 RMD160 0524e008a82800d816e8ad66316c71701e5bf0ef SHA1 942576d893b9255e705964a539780f387a013d63 SHA256 43a275e3580ff2c6767cb184e28bdcc50842330ff5d22b611922580d1d8c7c6f
+MD5 f28ac9fffcf3b2a06c4123523aa37aad ChangeLog 26627
+RMD160 0524e008a82800d816e8ad66316c71701e5bf0ef ChangeLog 26627
+SHA256 43a275e3580ff2c6767cb184e28bdcc50842330ff5d22b611922580d1d8c7c6f ChangeLog 26627
 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1
 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725
 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725

diff --git a/www-servers/lighttpd/files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff b/www-servers/lighttpd/files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff
deleted file mode 100644 (file)
index 56f4243..0000000
--- a/www-servers/lighttpd/files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/connections.c.orig     2007-01-05 10:56:08.000000000 -0800
-+++ src/connections.c  2007-01-05 10:56:23.000000000 -0800
-@@ -970,7 +970,7 @@
-                                                               }
-                                                       } else {
-                                                               /* a splited \r \n */
--                                                              return -1;
-+                                                              break;
-                                                       }
-                                               }
-                                       }

diff --git a/www-servers/lighttpd/files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff b/www-servers/lighttpd/files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff
deleted file mode 100644 (file)
index aa051c7..0000000
--- a/www-servers/lighttpd/files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- lighttpd-1.4.13/src/mod_fastcgi.c  2006-10-05 03:22:32.000000000 -0700
-+++ lighttpd-1.4.13.patch/src/mod_fastcgi.c    2006-10-18 00:57:19.000000000 -0700
-@@ -1875,8 +1875,36 @@
-       fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s));
- 
-       if (!buffer_is_empty(con->authed_user)) {
--              fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"),
--                           CONST_BUF_LEN(con->authed_user));
-+              fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"), CONST_BUF_LEN(con->authed_user));
-+      
-+              /* AUTH_TYPE fix by Troy Kruthoff (tkruthoff@gmail.com)
-+               * section 4.1.1 of RFC 3875 (cgi spec) requires the server to set a AUTH_TYPE env
-+               * declaring the type of authentication used.    (see http://tools.ietf.org/html/rfc3875#page-11)
-+               *
-+               * I copied this code from mod_auth.c where it extracts auth info from the "Authorization" 
-+               * header to authenticate the user before allowing the request to proceed.  I'm guessing it makes
-+               * sense to re-parse the header here, as mod_auth is unaware if the request is headed for cgi/fcgi.
-+               * Someone more familiar with the lighty internals should be able to quickly determine if we are 
-+               * better storing AUTH_TYPE on the initial parse in mod_auth.
-+               */
-+              char *http_authorization = NULL;
-+              data_string *ds;
-+              
-+              if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Authorization"))) {
-+                      http_authorization = ds->value->ptr;
-+              }
-+      
-+              if (ds && ds->value && ds->value->used) {
-+                      char *auth_realm;
-+                if (NULL != (auth_realm = strchr(http_authorization, ' '))) {
-+                              int auth_type_len = auth_realm - http_authorization;
-+                              if ((auth_type_len == 5) && (0 == strncmp(http_authorization, "Basic", auth_type_len))) {
-+                                        fcgi_env_add(p->fcgi_env, CONST_STR_LEN("AUTH_TYPE"), CONST_STR_LEN("Basic"));
-+                              } else if ((auth_type_len == 6) && (0 == strncmp(http_authorization, "Digest", auth_type_len))) {
-+                                        fcgi_env_add(p->fcgi_env, CONST_STR_LEN("AUTH_TYPE"), CONST_STR_LEN("Digest"));
-+                              }
-+                      }
-+              }
-       }
- 
-       if (con->request.content_length > 0 && host->mode != FCGI_AUTHORIZER) {

diff --git a/www-servers/lighttpd/files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff
deleted file mode 100644 (file)
index 1e6caf8..0000000
--- a/www-servers/lighttpd/files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h    2006-01-11 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h 2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
-       
-       /* the errorlog */
-       int errorlog_fd;
--      enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+      enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
-       buffer *errorlog_buf;
-       
-       fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c     2005-11-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c  2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
-               srv->errorlog_mode = ERRORLOG_SYSLOG;
-       } else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
-               const char *logfile = srv->srvconf.errorlog_file->ptr;
--              
--              if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--                      log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--                                      "opening errorlog '", logfile,
--                                      "' failed: ", strerror(errno));
--                      
-+
-+              if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+                      /* create write pipe and spawn process */
-+
-+                      int to_log_fds[2];
-+                      pid_t pid;
-+
-+                      if (pipe(to_log_fds)) {
-+                              log_error_write(srv, __FILE__, __LINE__, "ss",
-+                              "pipe failed: ", strerror(errno));
-+                              return -1;
-+                      }
-+
-+                      /* fork, execve */
-+                      switch (pid = fork()) {
-+                      case 0:
-+                              /* child */
-+
-+                              close(STDIN_FILENO);
-+                              dup2(to_log_fds[0], STDIN_FILENO);
-+                              close(to_log_fds[0]);
-+                              /* not needed */
-+                              close(to_log_fds[1]);
-+
-+                              /* we don't need the client socket */
-+                              for (fd = 3; fd < 256; fd++) {
-+                                      close(fd);
-+                              }
-+
-+                              /* exec the log-process (skip the | )
-+                               *
-+                               */
-+
-+                              execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+                              
-+                              log_error_write(srv, __FILE__, __LINE__, "sss",
-+                                      "spawning log-process failed: ",
-+                                      strerror(errno), logfile + 1);
-+
-+                              exit(-1);
-+                              break;
-+                      case -1:
-+                              /* error */
-+                              log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+                              break;
-+                      default:
-+                              close(to_log_fds[0]);
-+
-+                              srv->errorlog_fd = to_log_fds[1];
-+
-+                              break;
-+                      }
-+                      srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+                      log_error_write(srv, __FILE__, __LINE__, "SSS",
-+                              "opening errorlog '", logfile,"' impossible");
-                       return -1;
--              }
-+#endif
-+              } else {
-+                      if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+                              log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+                                      "opening errorlog '", logfile,
-+                                      "' failed: ", strerror(errno));
-+  
-+                              return -1;
-+                      }
-+                      srv->errorlog_mode = ERRORLOG_FILE;
-+              }
- #ifdef FD_CLOEXEC
--              /* close fd on exec (cgi) */
--              fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+              /* close fd on exec (cgi) */
-+              fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--              srv->errorlog_mode = ERRORLOG_FILE;
--      }
--      
-+      }
-+  
-       log_error_write(srv, __FILE__, __LINE__, "s", "server started");
-       
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--      /* only cycle if we are not in syslog-mode */
-+      /* only cycle if the error log is a file */
-       
-       if (srv->errorlog_mode == ERRORLOG_FILE) {
-               const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
-       log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
-       
-       switch(srv->errorlog_mode) {
-+      case ERRORLOG_PIPE: /* fall through */
-       case ERRORLOG_FILE:
-               close(srv->errorlog_fd);
-               break;
-@@ -154,6 +216,7 @@
-       va_list ap;
-       
-       switch(srv->errorlog_mode) {
-+      case ERRORLOG_PIPE:
-       case ERRORLOG_FILE:
-       case ERRORLOG_STDERR:
-               /* cache the generated timestamp */
-@@ -238,6 +301,7 @@
-       va_end(ap);
-       
-       switch(srv->errorlog_mode) {
-+      case ERRORLOG_PIPE: /* fall through */
-       case ERRORLOG_FILE:
-               BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
-               write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c 2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c      2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
-                *
-                * we feed the stderr of the CGI to our errorlog, if possible
-                */
--              if (srv->errorlog_mode == ERRORLOG_FILE) {
-+              if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
-                       close(STDERR_FILENO);
-                       dup2(srv->errorlog_fd, STDERR_FILENO);
-               }
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c     2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c  2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
-               
-               close(STDERR_FILENO);
-               
--              if (srv->errorlog_mode == ERRORLOG_FILE) {
-+              if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
-                       dup2(srv->errorlog_fd, STDERR_FILENO);
-                       close(srv->errorlog_fd);
-               }