Commit 99a6d69f authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Merge r321500 from trunk: 

* modules/http/http_request.c
  (ap_allow_methods): add missing va_end call

Submitted by: nd


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

CHANGES

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

Changes with Apache 2.0.56









  *) http_request.c: Add missing va_end call. [André Malo]

















  *) Add httxt2dbm to support/ for creating RewriteMap DBM Files.









     [Paul Querna]










































STATUS



+0
−3



























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



Original line number
Diff line number
Diff line







@@ -144,9 +144,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







       +1: pquerna, jerenkrantz, colm









       jerenkrantz notes: I do prefer the version from r190033 (own if check).



















    *) Add missing va_end call









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









       +1: nd, trawick, colm



















PATCHES PROPOSED TO BACKPORT FROM TRUNK:









  [ please place SVN revisions from trunk here, so it is easy to


































modules/http/http_request.c



+1
−0



























Changes for modules/http/http_request.c: 1 added line, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -519,6 +519,7 @@ AP_DECLARE(void) ap_allow_methods(request_rec *r, int reset, ...)







    while ((method = va_arg(methods, const char *)) != NULL) {









        ap_method_list_add(r->allowed_methods, method);









    }









    va_end(methods);









}



















AP_DECLARE(void) ap_allow_standard_methods(request_rec *r, int reset, ...)