From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 9 Apr 2008 09:16:40 +0000 (+0000)
Subject: Fixed bug #44673 (With CGI argv/argc starts from arguments, not from script)
X-Git-Tag: php-5.2.6RC5~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a548d2f19b2a5510a3554a576ea0f6b1a281ea76;p=php

Fixed bug #44673 (With CGI argv/argc starts from arguments, not from script)
---

diff --git a/NEWS b/NEWS
index a4a3de59da..091a86c22d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Apr 2008, PHP 5.2.6
+- Fixed bug #44673 (With CGI argv/argc starts from arguments, not from script)
+  (Dmitry)
 - Fixed bug #44667 (proc_open() does not handle pipes with the mode 'wb'
   correctly). (Jani)
 - Fixed bug #44650 (escaepshellscmd() does not check arg count). (Ilia)
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index e9cfe31403..a584dab515 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1760,7 +1760,7 @@ consult the installation file that came with this distribution, or visit \n\
 			} else if (argc > php_optind) {
 				/* file is on command line, but not in -f opt */
 				STR_FREE(SG(request_info).path_translated);
-				SG(request_info).path_translated = estrdup(argv[php_optind++]);
+				SG(request_info).path_translated = estrdup(argv[php_optind]);
 				/* arguments after the file are considered script args */
 				SG(request_info).argc = argc - php_optind;
 				SG(request_info).argv = &argv[php_optind];