Commit 6d17d530 authored by Nick Kew's avatar Nick Kew
Browse files

Backport fix to PR#39282 


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.2









  *) core: Prevent reading uninitialized memory while reading a line of









     protocol input.  PR 39282. [Davi Arnaut <davi haxent.com.br>]

















  *) mod_dbd: Update defaults, improve error reporting.









     [Chris Darroch <chrisd pearsoncmg com>, Nick Kew]










































STATUS



+0
−17



























Changes for STATUS: 0 added lines, 17 removed lines.



Original line number
Diff line number
Diff line







@@ -107,23 +107,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







          Trunk version works









      +1: rpluem, jim, wrowe



















    * core: Prevent read of unitialized memory in ap_rgetline_core. PR 39282.









        Trunk version of patch:









          http://svn.apache.org/viewcvs?rev=394070&view=rev









        2.2.x version of patch:









          Trunk version works









      +1: rpluem, trawick (with rev 295381), pquerna (with rev 295381)









      niq: the new comment isn't accurate; it applies to any brigade









      containing only (one or more) zero-length buckets.  The existing









      comment misled my review!  Fix the comment and you have my +1









      for the fix.









      jim: agrees with niq.









      rpluem: Does http://svn.apache.org/viewcvs?rev=395381&view=rev address









              the concerns (BTW: Same text as colm used in the backport to 2.0.x









              (r395197))?









              jim, does your agreement with niq also include his +1 in the case









              the comment is fixed?



















PATCHES PROPOSED TO BACKPORT FROM TRUNK:



















    * Backport mod_authz_dbd (it's had some testing now)


































server/protocol.c



+9
−0



























Changes for server/protocol.c: 9 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -217,6 +217,15 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,







    char *pos, *last_char = *s;









    int do_alloc = (*s == NULL), saw_eos = 0;



















    /*









     * Initialize last_char as otherwise a random value will be compared









     * against APR_ASCII_LF at the end of the loop if bb only contains









     * zero-length buckets.









     */









    if (last_char) {









        *last_char = '\0';









    }



















    for (;;) {









        apr_brigade_cleanup(bb);









        rv = ap_get_brigade(r->input_filters, bb, AP_MODE_GETLINE,