Selaa lähdekoodia

Don't abort PHP on fatal V8 errors, just warn about it

This way the PHP script can handle V8 errors gracefully
(and e.g. provide feedback to the user).

This especially changes behaviour when circular extension
dependencies happen (PHP code can go on, just V8 fails
to start).  This also fixes memory leaks of V8 and V8Js
itself caused by bailing out directly otherwise.
Stefan Siegl 9 vuotta sitten
vanhempi
commit
de23e8dba4
2 muutettua tiedostoa jossa 9 lisäystä ja 7 poistoa
  1. 7 1
      tests/extensions_circular_dependency.phpt
  2. 2 6
      v8js_class.cc

+ 7 - 1
tests/extensions_circular_dependency.phpt

@@ -36,4 +36,10 @@ array(2) {
   }
 }
 
-Fatal error: v8::Context::New() Circular extension dependency in %s on line 8
+Warning: Fatal V8 error in v8::Context::New(): Circular extension dependency in %s on line 8
+
+Fatal error: Uncaught V8JsException: Failed to create V8 context. Check that registered extensions do not have errors. in %s:8
+Stack trace:
+#0 %s(8): V8Js->__construct('myobj', Array, Array)
+#1 {main}
+  thrown in %s on line 8

+ 2 - 6
v8js_class.cc

@@ -301,14 +301,10 @@ static int v8js_create_ext_strarr(const char ***retval, int count, HashTable *ht
 
 static void v8js_fatal_error_handler(const char *location, const char *message) /* {{{ */
 {
-	v8::Isolate *isolate = v8::Isolate::GetCurrent();
-	if (isolate) {
-		isolate->Exit();
-	}
 	if (location) {
-		zend_error(E_ERROR, "%s %s", location, message);
+		zend_error(E_WARNING, "Fatal V8 error in %s: %s", location, message);
 	} else {
-		zend_error(E_ERROR, "%s", message);
+		zend_error(E_WARNING, "Fatal V8 error: %s", message);
 	}
 }
 /* }}} */