iliaa           Wed Oct  8 22:59:03 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/main       main.c 
  Log:
  MFH: Fixed bug #25746 (Do not bail out when unable to chdir original dir on
  systems with broken getcwd()).
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.431 php-src/NEWS:1.1247.2.432
--- php-src/NEWS:1.1247.2.431   Wed Oct  8 07:16:21 2003
+++ php-src/NEWS        Wed Oct  8 22:59:02 2003
@@ -9,6 +9,8 @@
 - 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)
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.49 php-src/main/main.c:1.512.2.50
--- php-src/main/main.c:1.512.2.49      Wed Oct  1 19:13:04 2003
+++ php-src/main/main.c Wed Oct  8 22:59:03 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.512.2.49 2003/10/01 23:13:04 andrei Exp $ */
+/* $Id: main.c,v 1.512.2.50 2003/10/09 02:59:03 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -1683,9 +1683,6 @@
 #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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to