From: Nick Kew Date: Wed, 27 Jan 2010 00:45:57 +0000 (+0000) Subject: Backport (trivial) r897570 X-Git-Tag: 2.2.15~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e130078b7da27dbf97f253d33220f95159644555;p=thirdparty%2Fapache%2Fhttpd.git Backport (trivial) r897570 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@903517 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index f48e847c6ec..c6d310f571e 100644 --- a/STATUS +++ b/STATUS @@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * http_request: We don't need to create new->allowed_methods both - on line 413 and again on line 450. - Patch: http://svn.apache.org/viewvc?view=revision&revision=897570 - +1: niq, sf, wrowe - * mod_authnz_ldap: log authn failures at INFO instead of WARN Trunk Patch: http://svn.apache.org/viewvc?rev=902641&view=rev 2.2.x Patch: trunk patch works diff --git a/modules/http/http_request.c b/modules/http/http_request.c index d10ec3cb893..3a7e5ef9858 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -388,7 +388,6 @@ static request_rec *internal_internal_redirect(const char *new_uri, new->err_headers_out = r->err_headers_out; new->subprocess_env = rename_original_env(r->pool, r->subprocess_env); new->notes = apr_table_make(r->pool, 5); - new->allowed_methods = ap_make_method_list(new->pool, 2); new->htaccess = r->htaccess; new->no_cache = r->no_cache;