From: Colm MacCarthaigh <colm@apache.org>
Date: Mon, 23 Jan 2006 19:09:44 +0000 (+0000)
Subject: Merge r321500 from trunk:
X-Git-Tag: 2.0.56~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bef6c40db74946b67084c29c32d8250974ce248e;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/CHANGES b/CHANGES
index ea56f44a0e5..fe30da47af5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- 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]
 
diff --git a/STATUS b/STATUS
index 08173e7e83d..722729859f9 100644
--- a/STATUS
+++ b/STATUS
@@ -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
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index d915b31cc00..97b4b649584 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -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, ...)