You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2012/07/23 17:34:06 UTC
svn commit: r1364681 - in /httpd/httpd/branches/2.4.x: ./
modules/arch/win32/mod_isapi.c modules/generators/mod_asis.c
modules/generators/mod_cgi.c modules/generators/mod_cgid.c
modules/http/http_request.c
Author: jorton
Date: Mon Jul 23 15:34:05 2012
New Revision: 1364681
URL: http://svn.apache.org/viewvc?rev=1364681&view=rev
Log:
Merge r1361803 from trunk:
Code clean up (remove useless memory allocation)
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 52648
Reviewed by: rjung, jim, jorton
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c
httpd/httpd/branches/2.4.x/modules/generators/mod_asis.c
httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c
httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c
httpd/httpd/branches/2.4.x/modules/http/http_request.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1361803
Modified: httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c?rev=1364681&r1=1364680&r2=1364681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c Mon Jul 23 15:34:05 2012
@@ -894,7 +894,7 @@ static int APR_THREAD_FUNC regfnServerSu
}
/* Reset the method to GET */
- r->method = apr_pstrdup(r->pool, "GET");
+ r->method = "GET";
r->method_number = M_GET;
/* Don't let anyone think there's still data */
Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_asis.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_asis.c?rev=1364681&r1=1364680&r2=1364681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_asis.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_asis.c Mon Jul 23 15:34:05 2012
@@ -70,7 +70,7 @@ static int asis_handler(request_rec *r)
/* This redirect needs to be a GET no matter what the original
* method was.
*/
- r->method = apr_pstrdup(r->pool, "GET");
+ r->method = "GET";
r->method_number = M_GET;
ap_internal_redirect_handler(location, r);
Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c?rev=1364681&r1=1364680&r2=1364681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c Mon Jul 23 15:34:05 2012
@@ -993,7 +993,7 @@ static int cgi_handler(request_rec *r)
/* This redirect needs to be a GET no matter what the original
* method was.
*/
- r->method = apr_pstrdup(r->pool, "GET");
+ r->method = "GET";
r->method_number = M_GET;
/* We already read the message body (if any), so don't allow
Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c?rev=1364681&r1=1364680&r2=1364681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c Mon Jul 23 15:34:05 2012
@@ -1593,7 +1593,7 @@ static int cgid_handler(request_rec *r)
/* This redirect needs to be a GET no matter what the original
* method was.
*/
- r->method = apr_pstrdup(r->pool, "GET");
+ r->method = "GET";
r->method_number = M_GET;
/* We already read the message body (if any), so don't allow
Modified: httpd/httpd/branches/2.4.x/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/http_request.c?rev=1364681&r1=1364680&r2=1364681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/http_request.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http/http_request.c Mon Jul 23 15:34:05 2012
@@ -197,7 +197,7 @@ AP_DECLARE(void) ap_die(int type, reques
"error-notes")) != NULL) {
apr_table_setn(r->subprocess_env, "ERROR_NOTES", error_notes);
}
- r->method = apr_pstrdup(r->pool, "GET");
+ r->method = "GET";
r->method_number = M_GET;
ap_internal_redirect(custom_response, r);
return;