Remove my changes specifics to PHP 8.2

@rryqszq4
rryqszq4 · Apr 2, 2023 · 4a16fd5 · 4a16fd5
1 parent 3f1f9cc
commit 4a16fd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/ngx-php/compile-ngx.sh b/.github/ngx-php/compile-ngx.sh
@@ -27,8 +27,7 @@ cd nginx-${NGINX_SRC_VERSION}
 # Show pwd
 pwd
 
-
-php-config
+#php-config
 export PHP_CONFIG="/usr/bin/php-config$PHP_SRC_VERSION"
 export PHP_LIB='/usr/lib'
 export NGX_PHP_LIBS="`$PHP_CONFIG --ldflags` `$PHP_CONFIG --libs` -L$PHP_LIB -lphp$PHP_MAJOR_VERSION "
@@ -48,7 +47,7 @@ else
               --add-dynamic-module=../third_party/ngx_devel_kit \
               --add-dynamic-module=..
 fi
-make CFLAGS="-Wno-error"
+make
 make install
 if [ $? -eq 0 ];then
     echo "Nginx install ... done"

diff --git a/src/ngx_http_php8_zend_uthread.c b/src/ngx_http_php8_zend_uthread.c
@@ -70,7 +70,7 @@ int ngx_http_php_zend_eval_stringl(char *str, size_t str_len, zval *retval_ptr,
 
     original_compiler_options = CG(compiler_options);
     CG(compiler_options) = ZEND_COMPILE_DEFAULT_FOR_EVAL;
-    new_op_array = zend_compile_string(code_str, string_name, ZEND_COMPILE_POSITION_AFTER_OPEN_TAG);
+    new_op_array = zend_compile_string(code_str, string_name);
     CG(compiler_options) = original_compiler_options;
 
     if (new_op_array) {
@@ -194,7 +194,7 @@ static int ngx_http_php_zend_call_function(zend_fcall_info *fci, zend_fcall_info
             fci_cache = &fci_cache_local;
         }
 
-        if (!zend_is_callable_ex(&fci->function_name, fci->object, 0, NULL, fci_cache, &error)) {
+        if (!zend_is_callable_ex(&fci->function_name, fci->object, IS_CALLABLE_CHECK_SILENT, NULL, fci_cache, &error)) {
             if (error) {
                 zend_string *callable_name
                     = zend_get_callable_name_ex(&fci->function_name, fci->object);