dmitry          Wed Apr  9 09:16:40 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed bug #44673 (With CGI argv/argc starts from arguments, not from script)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1137&r2=1.2027.2.547.2.1138&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1137 php-src/NEWS:1.2027.2.547.2.1138
--- php-src/NEWS:1.2027.2.547.2.1137    Tue Apr  8 17:17:07 2008
+++ php-src/NEWS        Wed Apr  9 09:16:39 2008
@@ -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)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.55&r2=1.267.2.15.2.56&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.55 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.56
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.55 Thu Feb 28 00:29:29 2008
+++ php-src/sapi/cgi/cgi_main.c Wed Apr  9 09:16:40 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.55 2008/02/28 00:29:29 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.56 2008/04/09 09:16:40 dmitry Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1760,7 +1760,7 @@
                        } 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];



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to