Commit 478191d0 authored by Graham Leggett's avatar Graham Leggett
Browse files

*) mod_cache_socache: Fix caching of empty headers up to carriage return. 

     trunk patch: http://svn.apache.org/r1824343
     2.4.x patch: trunk works (modulo CHANGES)
     +1: ylavic, rpluem, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824475 13f79535-47bb-0310-9956-ffa450edef68
parent 4f044636

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.30



  *) mod_cache_socache: Fix caching of empty headers up to carriage return.

     [Yann Ylavic]



  *) core: For consistency, ensure that read lines are NUL terminated on any

     error, not only on buffer full.  [Yann Ylavic]

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -118,10 +118,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_cache_socache: Fix caching of empty headers up to carriage return.

     trunk patch: http://svn.apache.org/r1824343

     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, rpluem, minfrin





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/cache/mod_cache_socache.c

+2 −1
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ static apr_status_t read_table(cache_handle_t *handle, request_rec *r, 
                        "Premature end of cache headers.");

                return APR_EGENERAL;

            }

            while (apr_isspace(buffer[colon])) {

            /* Do not go past the \r from above as apr_isspace('\r') is true */

            while (apr_isspace(buffer[colon]) && (colon < *slider)) {

                colon++;

            }

            apr_table_addn(table, apr_pstrndup(r->pool, (const char *) buffer