You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2009/08/03 16:38:53 UTC
svn commit: r800410 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/generators/mod_cgid.c
Author: rpluem
Date: Mon Aug 3 14:38:53 2009
New Revision: 800410
URL: http://svn.apache.org/viewvc?rev=800410&view=rev
Log:
Merge r726636 from trunk:
* Do not add an empty argument if we do not have any args for the script.
Fixes a regression from r682475.
PR: 46380
Reviewed by: rpluem, covener, minfrin
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=800410&r1=800409&r2=800410&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Aug 3 14:38:53 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.13
+ *) mod_cgid: Do not add an empty argument when calling the CGI script.
+ PR 46380 [Ruediger Pluem]
+
*) Fix potential segfaults with use of the legacy ap_rputs() etc
interfaces, in cases where an output filter fails. PR 36780.
[Joe Orton]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=800410&r1=800409&r2=800410&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Aug 3 14:38:53 2009
@@ -84,14 +84,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_cgid: Do not add an empty argument when calling the CGI script.
- PR 46380 (fixes a regression of r682475 (trunk) / r686392 (2.2.x).
- Trunk version of patch:
- http://svn.apache.org/viewvc?rev=726636&view=rev
- Backport version for 2.2.x of patch:
- Trunk version of patch works
- +1: rpluem, covener, minfrin
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c?rev=800410&r1=800409&r2=800410&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c Mon Aug 3 14:38:53 2009
@@ -203,7 +203,7 @@
char *w;
int idx = 0;
- if (ap_strchr_c(args, '=')) {
+ if (!(*args) || ap_strchr_c(args, '=')) {
numwords = 0;
}
else {