dmitry Fri Nov 28 11:57:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #46366 (bad cwd with / as pathinfo)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.31&r2=1.267.2.15.2.50.2.32&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.31
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.32
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.31 Sat Nov 8 22:56:17 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Nov 28 11:57:02 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.31 2008/11/08 22:56:17 rasmus Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.32 2008/11/28 11:57:02 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1078,6 +1078,9 @@
if (script_path_translated &&
(script_path_translated_len =
strlen(script_path_translated)) > 0 &&
(script_path_translated[script_path_translated_len-1] == '/' ||
+#ifdef PHP_WIN32
+
script_path_translated[script_path_translated_len-1] == '\\' ||
+#endif
(real_path =
tsrm_realpath(script_path_translated, NULL TSRMLS_CC)) == NULL)
) {
char *pt = estrndup(script_path_translated,
script_path_translated_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php