Commit 1851b6e7 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

grab this from 2.1-dev: 

mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
size.

PR:             20617
Submitted by:	Jesse Pelton <jsp pkc.com>
Reviewed by:	trawick, stoddard, nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103527 13f79535-47bb-0310-9956-ffa450edef68
parent 1c5db41c

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.50









  *) mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer









     size.  PR 20617.  [Jesse Pelton <jsp pkc.com>]

















  *) mod_dav: Fix a problem that could cause crashes when manipulating 









     locks on some platforms.  [Jeff Trawick]










































STATUS



+1
−6



























Changes for STATUS: 1 added line, 6 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/04/26 15:45:52 $]









Last modified at [$Date: 2004/04/26 15:54:22 $]



















Release:




















@@ -353,11 +353,6 @@ PATCHES TO BACKPORT FROM 2.1







         nd replies: But if it can't be 0 the alternatives thereafter make no









           sense anymore, right?



















    * mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer









      size.  PR 20617  [Jesse Pelton <jsp pkc.com>]









        http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.96&r2=1.97









      +1: trawick, stoddard, nd



















    * mod_isapi: send_response_header() failed to copy status string's 









      last character.  PR 20619.  [Jesse Pelton <jsp pkc.com>]









      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.97&r2=1.98


































modules/arch/win32/mod_isapi.c



+1
−1



























Changes for modules/arch/win32/mod_isapi.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -540,7 +540,7 @@ int APR_THREAD_FUNC GetServerVariable (isapi_cid    *cid,







        int i;



















        for (len = 0, i = 0; i < arr->nelts; i++) {









            len += strlen(elts[i].key) + strlen(elts[i].val) + 2;









            len += strlen(elts[i].key) + strlen(elts[i].val) + 3;









        }









  









        if (*buf_size < len + 1) {