cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c

dmitry Wed Apr 9 09:16:51 2008 UTC Modified files: (Branch: PHP_5_3) /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/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.16&r2=1.267.2.15.2.50.2.17&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.50.2.16 php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.17 --- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.16 Tue Mar 18 22:23:20 2008 +++ php-src/sapi/cgi/cgi_main.c Wed Apr 9 09:16:51 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.16 2008/03/18 22:23:20 rasmus Exp $ */ +/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.17 2008/04/09 09:16:51 dmitry Exp $ */ #include "php.h" #include "php_globals.h" @@ -1800,7 +1800,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];