MFH: Fixed bug #25746 (Do not bail out when unable to chdir original dir on

systems with broken getcwd()).

diff --git a/NEWS b/NEWS
index 7031abcb662e50d40c98a1ab3e908c494b17a1e2..76bb11eab332814aa0ef961c73e7431ca289b6f4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP 4                                                                      NEWS
 - Fixed bug #25764 (ldap_get_option() crashes with unbound ldap link). (Jani)
 - Fixed bug #25758 (var_export does not escape ' & \ inside array keys). (Ilia)
 - Fixed bug #25752 (ext/ncurses: ncurses.h instead of curses.h with BSD). (Jani)
+- Fixed bug #25746 (Do not bail out when unable to chdir original dir on 
+  systems with broken getcwd()). (Ilia)
 - Fixed bug #25745 (ctype functions fail with non-ascii characters). (Moriyoshi)
 - Fixed bug #25744 (make ZTS build of ext/sybase compile). (Ilia)
 - Fixed bug #25738 (alloca() related issues on the Darwin platform). (Moriyoshi)

diff --git a/main/main.c b/main/main.c
index f4137479ae5ae5f72f80f0647d7382c8a76695a5..318842adba3309506a781f6e3402debbdcf81715 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1683,9 +1683,6 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
 #if HAVE_BROKEN_GETCWD
                        /* this looks nasty to me */
                        old_cwd_fd = open(".", 0);
-                       if (old_cwd_fd == -1) {
-                               zend_bailout();
-                       }
 #else
                        VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1);
 #endif