Merge r371013 from trunk:

* Fix PR38340 by actual getting the word and thus advancing the message buffer
  pointer to the next data.

Submitted by: Aleksey Pesternikov <apesternikov yahoo.com>
Reviewed by: Ruediger Pluem

Submitted by: rpluem
Reviewed by: jim

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

diff --git a/CHANGES b/CHANGES
index 24e0f18741cd3ea78720ba004186b8a79dd8ca0b..1bc8e89e197ab8c8a8ee30f6f546095e41606abe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
+     PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>, Ruediger Pluem]
+
   *) mod_proxy_balancer: Do not overwrite the status of initialized workers and
      respect the configured status of uninitilized workers when creating a new
      child process. [Ruediger Pluem]

diff --git a/STATUS b/STATUS
index 8b4c4d0ad52543cd8d0d3863ee1e9a00d32f33c0..6d3589b9c3aeccf8cfd567dd670c75354a2359d9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -83,14 +83,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       -0: niq: Please explain why return value of ap_pass_brigade is
                put into a variable and immediately discarded.
 
-    * mod_proxy_ajp: Fix PR38340 (mod_proxy_ajp does not support common
-      headers (0xA0??))
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=371013&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, wrowe, jerenkrantz
-
     * core: Fix PR38123 (Invalid Expect header not immediately rejected)
       Trunk version of patch:
          http://svn.apache.org/viewcvs.cgi?rev=370172&view=rev

diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index 49ee13ea97209d5598f221dda8e9fdb0521b6497..58e714a9ac8b8f196e054e9b168bec6902d98df0 100644 (file)
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -506,7 +506,7 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
         }
 
         if ((name & 0XFF00) == 0XA000) {
-            ajp_msg_peek_uint16(msg, &name);
+            ajp_msg_get_uint16(msg, &name);
             stringname = long_res_header_for_sc(name);
             if (stringname == NULL) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,