Fixes:

* Avoid closing stdin (I could have sworn I've committed that already)
* unclean_shutdown patches

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index a74148fc8c1f5c66c5172819cb21ae5c4f46b5c5..ba18fbdcc0941985012bd93c44ff5985cb766108 100644 (file)
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -167,11 +167,15 @@ ZEND_API void zend_close_file_handle(zend_file_handle *file_handle)
                        close(file_handle->handle.fd);
                        break;
                case ZEND_HANDLE_FP:
-                       fclose(file_handle->handle.fp);
+                       if (file_handle->handle.fp != stdin) {
+                               fclose(file_handle->handle.fp);
+                       }
                        break;
 #ifdef ZTS
                case ZEND_HANDLE_ISTREAM:
-                       delete file_handle->handle.is;
+                       if (file_handle->handle.is != &cin) {
+                               delete file_handle->handle.is;
+                       }
                        break;
 #endif
        }

diff --git a/Zend/zend.c b/Zend/zend.c
index ef436f89404cde330625e92cd977b27f04e3a060..f9b0640d09512de87e587eb1d707aeb5effe944f 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -322,8 +322,10 @@ void zenderror(char *error)
 
 ZEND_API void zend_bailout()
 {
+       CLS_FETCH();
        ELS_FETCH();
 
+       CG(unclean_shutdown) = 1;
        longjmp(EG(bailout), FAILURE);
 }