From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 9 Oct 2003 02:59:03 +0000 (+0000)
Subject: MFH: Fixed bug #25746 (Do not bail out when unable to chdir original dir on
X-Git-Tag: php-4.3.4RC2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac534dbf37357a9e6d471fc646f289396c60ae5f;p=php

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 7031abcb66..76bb11eab3 100644
--- 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 f4137479ae..318842adba 100644
--- 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