diff options
| author | Andrei Belov <defan@nginx.com> | 2018-12-20 20:25:50 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2018-12-20 20:25:50 +0300 |
| commit | 82e12d0cdeeb707ad4b1aef91c5e90b4347b0831 (patch) | |
| tree | 19ef4cf3dea340fa365af022c76543f92d1e2e0a /auto/modules/php | |
| parent | b140ac29e5571e9abaafce006932f15d86b78803 (diff) | |
| parent | 4195a29fabfe65f5a28baf2405c2077e2ba3c09a (diff) | |
| download | unit-82e12d0cdeeb707ad4b1aef91c5e90b4347b0831.tar.gz unit-82e12d0cdeeb707ad4b1aef91c5e90b4347b0831.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'auto/modules/php')
| -rw-r--r-- | auto/modules/php | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/auto/modules/php b/auto/modules/php index 762c1621..362bbc69 100644 --- a/auto/modules/php +++ b/auto/modules/php @@ -111,7 +111,7 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then #include <php_main.h> int main() { - php_request_startup(); + php_module_startup(NULL, NULL, 0); return 0; }" @@ -124,6 +124,30 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then exit 1; fi + # Bug #71041 (https://bugs.php.net/bug.php?id=71041). + + nxt_feature="PHP zend_signal_startup()" + nxt_feature_name="" + nxt_feature_run=no + nxt_feature_incs="${NXT_PHP_INCLUDE}" + nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" + nxt_feature_test=" + #include <php.h> + #include <php_main.h> + + int main() { + zend_signal_startup(); + return 0; + }" + + . auto/feature + + if [ $nxt_found = yes ]; then + NXT_ZEND_SIGNAL_STARTUP=1 + else + NXT_ZEND_SIGNAL_STARTUP=0 + fi + else $echo $echo $0: error: no PHP found. @@ -181,6 +205,7 @@ for nxt_src in $NXT_PHP_MODULE_SRCS; do $NXT_BUILD_DIR/$nxt_obj: $nxt_src \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_PHP_INCLUDE \\ + -DNXT_ZEND_SIGNAL_STARTUP=$NXT_ZEND_SIGNAL_STARTUP \\ $nxt_dep_flags \\ -o $NXT_BUILD_DIR/$nxt_obj $nxt_src $nxt_dep_post @@ -191,7 +216,7 @@ END done - + cat << END >> $NXT_MAKEFILE .PHONY: ${NXT_PHP_MODULE} |