Commit aeae2e7e authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Merge r1244211: 

    Make sure the getsfunc_*() functions used by ap_scan_script_header_err*()
    NUL-terminate the resulting string, even in case of an error. mod_cgi and
    mod_cgid try to log incomplete output from CGI scripts.

Reviewed by: sf, covener, wrowe


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ Changes with Apache 2.2.23 
     envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the

     current working directory to be searched for DSOs. [Stefan Fritsch]



  *) core: Adjust ap_scan_script_header_err*() to prevent mod_cgi and mod_cgid

     from logging bogus data in case of errors. [Stefan Fritsch]



  *) mod_disk_cache, mod_mem_cache: Decline the opportunity to cache if the

     response is a 206 Partial Content. This stops a reverse proxied partial

     response from becoming cached, and then being served in subsequent

STATUS

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

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



  * core: NUL-terminate string returned by ap_scan_script_header_err*()

    in error case.

    Trunk patch:

      http://svn.apache.org/viewvc?rev=1244211&view=rev

    2.4.x patch:

      http://svn.apache.org/viewvc?rev=1244213&view=rev

    2.2.x patch:

      Trunk version works

    +1: sf, covener, wrowe



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/util_script.c

+4 −1
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ static int getsfunc_BRIGADE(char *buf, int len, void *arg) 
        rv = apr_bucket_read(e, &bucket_data, &bucket_data_len,

                             APR_BLOCK_READ);

        if (rv != APR_SUCCESS || (bucket_data_len == 0)) {

            *dst = '\0';

            return APR_STATUS_IS_TIMEUP(rv) ? -1 : 0;

        }

        src = bucket_data;
@@ -681,8 +682,10 @@ static int getsfunc_STRING(char *w, int len, void *pvastrs) 
    const char *p;

    int t;



    if (!strs->curpos || !*strs->curpos)

    if (!strs->curpos || !*strs->curpos) {

        w[0] = '\0';

        return 0;

    }

    p = ap_strchr_c(strs->curpos, '\n');

    if (p)

        ++p;