Trival backports having 3 * +1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@356764 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2c267f3498fcb19584b3ea939ee3cbb0a7cde5b4..883c4d49197da6ab64bbf7b7cb66e5d1aa090d84 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,11 @@ Changes with Apache 2.2.1
   *) 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

diff --git a/STATUS b/STATUS
index e2be3c7fa9dd3484c92d5a239763429d26f2c822..98be9b0b4a94f87b780ae7c433e390f07abfb04b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -82,23 +82,10 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
 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
       configuration defaults and merge function.

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 988508adf342f34f6d65426354c1cc8149101ef1..def1919254def86a9f578025ec9fbff1fdfce9df 100644 (file)
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -113,7 +113,7 @@ static char *get_path_param(apr_pool_t *pool, char *url,
     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

diff --git a/server/protocol.c b/server/protocol.c
index d5b1d6cc2c7e2cbaa22b1a45d801c68e4529d446..aadb4391d630d553f83df3fc7e6288284cd018ee 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -990,6 +990,8 @@ request_rec *ap_read_request(conn_rec *conn)
     }
 
     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);