cvs: php-src /main main.c
| From: | Ilia Alshanetsky | Date: | Mon, 25 Sep 2006 14:49:34 +0000 |
| Subject: | cvs: php-src /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40704@lists.php.net to get a copy of this message | ||
iliaa Mon Sep 25 14:49:34 2006 UTC
Modified files:
/php-src/main main.c
Log:
MFB: Fixed bug #38904 (apache2filter changes cwd to /).
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.702&r2=1.703&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.702 php-src/main/main.c:1.703
--- php-src/main/main.c:1.702 Tue Sep 19 10:38:31 2006
+++ php-src/main/main.c Mon Sep 25 14:49:34 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.702 2006/09/19 10:38:31 dmitry Exp $ */
+/* $Id: main.c,v 1.703 2006/09/25 14:49:34 iliaa Exp $ */
/* {{{ includes
*/
@@ -1859,8 +1859,7 @@
PG(during_request_startup) = 0;
- if (primary_file->type == ZEND_HANDLE_FILENAME
- && primary_file->filename) {
+ if ((primary_file->type == ZEND_HANDLE_FILENAME || primary_file->type ==
ZEND_HANDLE_STREAM) && primary_file->filename) {
#if HAVE_BROKEN_GETCWD
/* this looks nasty to me */
old_cwd_fd = open(".", 0);