]> git.pld-linux.org Git - packages/lighttpd.git/commitdiff
- outdated in 1.3.14
authorElan Ruusamäe <glen@pld-linux.org>
Thu, 16 Jun 2005 11:39:42 +0000 (11:39 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    lighttpd-fcgi-retry-timeout.patch -> 1.2
    lighttpd-proxy-error-handler.patch -> 1.2
    lighttpd-request_header-print.patch -> 1.2

lighttpd-fcgi-retry-timeout.patch [deleted file]
lighttpd-proxy-error-handler.patch [deleted file]
lighttpd-request_header-print.patch [deleted file]

diff --git a/lighttpd-fcgi-retry-timeout.patch b/lighttpd-fcgi-retry-timeout.patch
deleted file mode 100644 (file)
index ead4889..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- lighttpd-1.3.13/src/settings.h~    2005-04-19 10:50:29.000000000 +0300
-+++ lighttpd-1.3.13/src/settings.h     2005-04-19 10:50:30.000000000 +0300
-@@ -6,7 +6,9 @@
- #define INET_NTOP_CACHE_MAX 4
- #define FILE_CACHE_MAX      16
-+#ifndef FCGI_RETRY_TIMEOUT
- #define FCGI_RETRY_TIMEOUT  (5 * 60)
-+#endif
- /**
-  * max size of a buffer which will just be reset
diff --git a/lighttpd-proxy-error-handler.patch b/lighttpd-proxy-error-handler.patch
deleted file mode 100644 (file)
index 9594159..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
---- trunk/src/mod_proxy.c      (revision 258)
-+++ trunk/src/mod_proxy.c      (revision 259)
-@@ -365,8 +365,6 @@
-                       log_error_write(srv, __FILE__, __LINE__, "sdsd", 
-                                       "connect failed:", proxy_fd, strerror(errno), errno);
-                       
--                      proxy_connection_cleanup(srv, hctx);
--                      
-                       return -1;
-               }
-       }
-@@ -615,7 +613,7 @@
- }
--static int proxy_write_request(server *srv, handler_ctx *hctx) {
-+static handler_t proxy_write_request(server *srv, handler_ctx *hctx) {
-       data_proxy *host= hctx->host;
-       
-       int r;
-@@ -629,7 +627,7 @@
-               
-               if (-1 == (hctx->fd->fd = socket(r, SOCK_STREAM, 0))) {
-                       log_error_write(srv, __FILE__, __LINE__, "ss", "socket failed: ", strerror(errno));
--                      return -1;
-+                      return HANDLER_ERROR;
-               }
-               
-               srv->cur_fds++;
-@@ -639,9 +637,7 @@
-               if (-1 == fdevent_fcntl_set(srv->ev, hctx->fd)) {
-                       log_error_write(srv, __FILE__, __LINE__, "ss", "fcntl failed: ", strerror(errno));
-                       
--                      proxy_connection_cleanup(srv, hctx);
--                      
--                      return -1;
-+                      return HANDLER_ERROR;
-               }
-               
-               /* fall through */
-@@ -706,10 +702,10 @@
-               break;
-       default:
-               log_error_write(srv, __FILE__, __LINE__, "s", "(debug) unknown state");
--              return -1;
-+              return HANDLER_ERROR;
-       }
-       
--      return 0;
-+      return HANDLER_GO_ON;
- }
- #define PATCH(x) \
-@@ -779,7 +775,8 @@
-       if (con->mode != p->id) return HANDLER_GO_ON;
-       
-       /* ok, create the request */
--      if (-1 == proxy_write_request(srv, hctx)) {
-+      switch(proxy_write_request(srv, hctx)) {
-+      case HANDLER_ERROR:
-               log_error_write(srv, __FILE__, __LINE__,  "sbdd", "proxy-server disabled:", 
-                               host->host,
-                               host->port,
-@@ -789,9 +786,17 @@
-               host->usage = -1;
-               host->disable_ts = srv->cur_ts;
-               
-+              proxy_connection_cleanup(srv, hctx);
-+              
-               con->mode = DIRECT;
-               con->http_status = 503;
-               return HANDLER_FINISHED;
-+      case HANDLER_WAIT_FOR_EVENT:
-+              return HANDLER_WAIT_FOR_EVENT;
-+      case HANDLER_WAIT_FOR_FD:
-+              return HANDLER_WAIT_FOR_FD;
-+      default:
-+              break;
-       }
-       
-       if (con->file_started == 1) {
diff --git a/lighttpd-request_header-print.patch b/lighttpd-request_header-print.patch
deleted file mode 100644 (file)
index 572fc8b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-output byte, instead of number if the request line contains invalid char
-
---- ../src/request.c~  2005-04-19 19:05:00.000000000 +0300
-+++ ../src/request.c   2005-04-19 19:05:05.000000000 +0300
-@@ -450,12 +450,15 @@
-                               /* check uri for invalid characters */
-                               for (j = 0; j < con->request.uri->used - 1; j++) {
-                                       if (!request_uri_is_valid_char(con->request.uri->ptr[j])) {
-+                                              unsigned char buf[2];
-+                                          buf[0] = con->request.uri->ptr[j];
-+                                              buf[1] = '\0';
-+
-                                               con->http_status = 400;
-                                               con->keep_alive = 0;
-                                               
--                                              log_error_write(srv, __FILE__, __LINE__, "sd",
--                                                              "invalid character in URI -> 400",
--                                                              con->request.uri->ptr[j]);
-+                                              log_error_write(srv, __FILE__, __LINE__, "sss",
-+                                                              "invalid character in URI", buf, "-> 400");
-                                               
-                                               if (srv->srvconf.log_request_header_on_error) {
-                                                       log_error_write(srv, __FILE__, __LINE__, "Sb",
This page took 0.034355 seconds and 4 git commands to generate.