MFH: Added hook for compile_string()

diff --git a/Zend/zend.c b/Zend/zend.c
index 63785613c7285f0846384dde3d5655c85d303fbc..2604bd7d4333e3dfa3b4cc0bd545cac0321ccf00 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -605,6 +605,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
        zend_getenv = utility_functions->getenv_function;
 
        zend_compile_file = compile_file;
+       zend_compile_string = compile_string;
        zend_execute = execute;
        zend_execute_internal = NULL;
        zend_throw_exception_hook = NULL;

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 117e5e3d7f32302d8536f84ece916992914867ef..e4dcb93f381df71739198611fd8ee03e4df3b184 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -32,6 +32,7 @@
 #endif /* ZEND_MULTIBYTE */
 
 ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
+ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC);
 
 
 #ifndef ZTS

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index d815579073f0bf3c597f41512d3b5a0e1db7931d..ee1c0ada8b6cf156898e2a1c0fd3b6caf66baf2e 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -321,6 +321,7 @@ void shutdown_compiler(TSRMLS_D);
 void zend_init_compiler_data_structures(TSRMLS_D);
 
 extern ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
+extern ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC);
 
 ZEND_API int lex_scan(zval *zendlval TSRMLS_DC);
 void startup_scanner(TSRMLS_D);

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index e7d78c40293be6a09c9e62938fb0b22c609bc8f9..142cc0e371d3f7741c13ac432cb4a23c50934f7f 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1101,7 +1101,7 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSR
 
        original_handle_op_arrays = CG(handle_op_arrays);
        CG(handle_op_arrays) = 0;
-       new_op_array = compile_string(&pv, string_name TSRMLS_CC);
+       new_op_array = zend_compile_string(&pv, string_name TSRMLS_CC);
        CG(handle_op_arrays) = original_handle_op_arrays;
 
        if (new_op_array) {

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 9b563ee8e294510d56d994ca98ddfe000d63f7f0..fb2f5a1e21da3732dc0818c6562cc158d318c01e 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2766,7 +2766,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
                case ZEND_EVAL: {
                                char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC);
 
-                               new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC);
+                               new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC);
                                efree(eval_desc);
                        }
                        break;

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 91ebfe35646182b4fa0fe565d2185ca9d5a40a76..e50e292f3c3a3582c071334a41e6289f1db993b3 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1960,7 +1960,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                case ZEND_EVAL: {
                                char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC);
 
-                               new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC);
+                               new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC);
                                efree(eval_desc);
                        }
                        break;
@@ -4460,7 +4460,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                case ZEND_EVAL: {
                                char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC);
 
-                               new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC);
+                               new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC);
                                efree(eval_desc);
                        }
                        break;
@@ -7542,7 +7542,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                case ZEND_EVAL: {
                                char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC);
 
-                               new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC);
+                               new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC);
                                efree(eval_desc);
                        }
                        break;
@@ -19764,7 +19764,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                case ZEND_EVAL: {
                                char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC);
 
-                               new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC);
+                               new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC);
                                efree(eval_desc);
                        }
                        break;