iliaa Mon Sep 25 14:48:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main main.c
Log:
Fixed bug #38904 (apache2filter changes cwd to /).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.262&r2=1.2027.2.547.2.263&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.262 php-src/NEWS:1.2027.2.547.2.263
--- php-src/NEWS:1.2027.2.547.2.262 Sun Sep 24 18:06:37 2006
+++ php-src/NEWS Mon Sep 25 14:48:32 2006
@@ -8,6 +8,7 @@
(Dmitry)
- Fixed bug #38941 (imap extension does not compile against new version of
the imap library). (Ilia)
+- Fixed bug #38904 (apache2filter changes cwd to /). (Ilia, bjori)
- Fixed bug #38844 (curl_easy_strerror() is defined only since cURL 7.12.0).
(Tony)
- Fixed bug #38623 (leaks in a tricky code with switch() and exceptions).
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.15&r2=1.640.2.23.2.16&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.15 php-src/main/main.c:1.640.2.23.2.16
--- php-src/main/main.c:1.640.2.23.2.15 Mon Sep 18 23:08:36 2006
+++ php-src/main/main.c Mon Sep 25 14:48:33 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.15 2006/09/18 23:08:36 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.16 2006/09/25 14:48:33 iliaa Exp $ */
/* {{{ includes
*/
@@ -1704,8 +1704,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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
