felipe Sun, 03 Jul 2011 14:45:41 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312855
Log: - Fixed bug #55118 (Imcomplete start message) Bug: https://bugs.php.net/55118 (Open) Imcomplete start message Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c U php/php-src/trunk/sapi/cli/php_cli_server.c Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c =================================================================== --- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-03 09:14:19 UTC (rev 312854) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-03 14:45:41 UTC (rev 312855) @@ -2069,7 +2069,15 @@ return 1; } } else { - document_root = "."; + char path[MAXPATHLEN]; + char *ret = NULL; + +#if HAVE_GETCWD + ret = VCWD_GETCWD(path, MAXPATHLEN); +#elif HAVE_GETWD + ret = VCWD_GETWD(path); +#endif + document_root = ret ? path : "."; } if (argc > php_optind) { Modified: php/php-src/trunk/sapi/cli/php_cli_server.c =================================================================== --- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-03 09:14:19 UTC (rev 312854) +++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-03 14:45:41 UTC (rev 312855) @@ -2069,7 +2069,15 @@ return 1; } } else { - document_root = "."; + char path[MAXPATHLEN]; + char *ret = NULL; + +#if HAVE_GETCWD + ret = VCWD_GETCWD(path, MAXPATHLEN); +#elif HAVE_GETWD + ret = VCWD_GETWD(path); +#endif + document_root = ret ? path : "."; } if (argc > php_optind) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
