Merge branch 'PHP-5.4'

Author: laruence

ext/session/mod_user.c

@@ -99,16 +99,30 @@ PS_OPEN_FUNC(user)
 
 PS_CLOSE_FUNC(user)
 {
+	zend_bool bailout = 0;
 	STDVARS;
 
 	if (!PS(mod_user_implemented)) {
 		/* already closed */
 		return SUCCESS;
 	}
 
-	retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC);
+	zend_try {
+		retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC);
+	} zend_catch {
+		bailout = 1;
+		PS(mod_user_implemented) = 0;
+	} zend_end_try();
+
 	PS(mod_user_implemented) = 0;
 
+	if (bailout) {
+		if (retval) {
+			zval_ptr_dtor(&retval);
+		}
+		zend_bailout();
+	}
+
 	FINISH;
 }