httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r356764 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/mod_proxy_balancer.c server/protocol.c
Date Wed, 14 Dec 2005 10:05:54 GMT
Author: niq
Date: Wed Dec 14 02:05:48 2005
New Revision: 356764

URL: http://svn.apache.org/viewcvs?rev=356764&view=rev
Log:
Trival backports having 3 * +1

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
    httpd/httpd/branches/2.2.x/server/protocol.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=356764&r1=356763&r2=356764&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Dec 14 02:05:48 2005
@@ -16,6 +16,11 @@
   *) Fix recursive ErrorDocument handling.  PR 36090. 
      [Chris Darroch <chrisd pearsoncmg.com>]
 
+  *) Don't hang on error return from post_read_request.  PR37790 [Nick Kew]
+
+  *) Fix off-by-one error in proxy_balancer.  PR37753
+     [Kazuhiro Osawa <ko yappo ne jp>]
+
 Changes with Apache 2.2.0
 
   *) mod_negotiation: Minor performance tweak by reusing already calculated

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=356764&r1=356763&r2=356764&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Dec 14 02:05:48 2005
@@ -82,22 +82,9 @@
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
-    * mod_proxy_balancer: Fix PR37753 (mod_proxy_balancer Stickysession that
-      uses URL doesn't work)
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=352010&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, jerenkrantz, jim
-
     * mod_ssl/ab: Fix compiler warnings with OpenSSL 0.9.8a.
         http://svn.apache.org/viewcvs.cgi?rev=349415&view=rev
       +1: jorton, jerenkrantz
-
-    * core: Die properly if an error occurs in post_read_request
-      http://svn.apache.org/viewcvs.cgi?rev=354085&view=rev
-      PR: 37790
-      +1: niq, jerenkrantz, jim
 
     * mod_dbd: When threaded, create a private pool in child_init
       so we're not using the process pool later.  Also improve

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?rev=356764&r1=356763&r2=356764&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Wed Dec 14 02:05:48 2005
@@ -113,7 +113,7 @@
     char *path = NULL;
 
     for (path = strstr(url, name); path; path = strstr(path + 1, name)) {
-        path += (strlen(name) + 1);
+        path += strlen(name);
         if (*path == '=') {
             /*
              * Session path was found, get it's value

Modified: httpd/httpd/branches/2.2.x/server/protocol.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/protocol.c?rev=356764&r1=356763&r2=356764&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.2.x/server/protocol.c Wed Dec 14 02:05:48 2005
@@ -990,6 +990,8 @@
     }
 
     if ((access_status = ap_run_post_read_request(r))) {
+        ap_add_input_filter_handle(ap_http_input_filter_handle,
+                                   NULL, r, r->connection);
         ap_die(access_status, r);
         ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
         ap_run_log_transaction(r);



Mime
View raw message