From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 21 Jan 2006 11:30:41 +0000 (+0000)
Subject: * Fix PR38340 by actual getting the word and thus advancing the message buffer
X-Git-Tag: 2.3.0~2587
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d66bb0a4d068c9c9e54f1f2537b78f6fe679db4f;p=thirdparty%2Fapache%2Fhttpd.git

* 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@371013 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index a8faf7e95f4..1f7b0eaa558 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
+     PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>, Ruediger Pluem]
+
   *) core: Reject invalid Expect header immediately. PR 38123.
      [Ruediger Pluem]
 
@@ -9,17 +12,17 @@ Changes with Apache 2.3.0
      authn directives such as 'AuthType', 'AuthName'.  Move the directives
      'AuthType' and 'AuthName' out of the core module and merge mod_authz_alias 
      into mod_authn_core. [Brad Nicholes]
-      
+
   *) Authz: Mark the directives 'Order', 'Allow', 'Deny' and 'Satisfy' as 
      deprecated and move them into the new module mod_access_compat which
      can be loaded to provide backwards compatibility for these directives.
      [Brad Nicholes]
-     
+
   *) Authz: Move the 'Require' directive from the core module as well as 
      add the directives '<SatisfyAll>', '<SatisfyOne>', '<RequireAlias>' 
      and 'Reject' to mod_authz_core. The new directives introduce 'AND/OR' 
      logic into the authorization processing. [Brad Nicholes]
-     
+
   *) Authz: Add the new module mod_authz_core which acts as the 
      authorization provider vector and contains common authz 
      directives. [Brad Nicholes]
@@ -33,7 +36,7 @@ Changes with Apache 2.3.0
 
   *) Authz: Convert all of the authz modules from hook based to 
      provider based. [Brad Nicholes]
-  
+
   *) mod_cache: Add CacheMinExpire directive to set the minimum time in
      seconds to cache a document.
      [Brian Akins <brian.akins turner.com>, Ruediger Pluem]
diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index 6f1133377cf..03bfec4e04f 100644
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -507,7 +507,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,