[src] Copy from https://github.com/rryqszq4/ngx_php7/releases/tag/v0.0.13

Author: rryqszq4

.travis.yml

@@ -27,12 +27,15 @@ compiler:
 cache:
   - apt
 env:
-  - PHP_SRC_VERSION=7.0.29
+  - PHP_SRC_VERSION=7.0.30
     NGINX_SRC_VERSION=1.10.3
-  - PHP_SRC_VERSION=7.1.16
+  - PHP_SRC_VERSION=7.1.19
     NGINX_SRC_VERSION=1.10.3
-  - PHP_SRC_VERSION=7.2.4
+  - PHP_SRC_VERSION=7.2.7
     NGINX_SRC_VERSION=1.10.3
+  - PHP_SRC_VERSION=7.2.7
+    NGINX_SRC_VERSION=1.10.3
+    NGINX_MODULE=DYNAMIC
 install:
   - sudo cpanm -n Test::Nginx
 before_script:

ChangeLog

@@ -1,3 +1,12 @@
+ngx_php7 0.0.13 changes:                                                            15 Sep 2018
+    * Add directive header_filter_by_php, body_filter_by_php, init_worker_by_php, log_by_php.
+
+    * Add php impl ngx_var::get, ngx_var::set.
+
+    * Supports dynamic module by kjdev.
+
+    * Hello world test performance.
+
 ngx_php7 0.0.12 changes:                                                            10 Apr 2018
     * Add php impl ngx_socket::connect, ngx_socket::send, ngx_socket::recv, ngx_socket::close.
 

README.md

@@ -1,11 +1,12 @@
-<div align="left">
-<a href="https://github.com/rryqszq4/ngx_php7"><img width="320" src="https://raw.githubusercontent.com/rryqszq4/ngx_php7/master/docs/ngx_php7_logo_v0.2.png"></a>
-</div>
-
+ngx_php7
+========
 [![Build Status](https://travis-ci.org/rryqszq4/ngx_php7.svg?branch=master)](https://travis-ci.org/rryqszq4/ngx_php7)
+[![GitHub release](https://img.shields.io/github/release/rryqszq4/ngx_php7.svg)](https://github.com/rryqszq4/ngx_php7/releases/latest)
 [![license](https://img.shields.io/badge/license-BSD--2--Clause-blue.svg)](https://github.com/rryqszq4/ngx_php7/blob/master/LICENSE)
 [![QQ group](https://img.shields.io/badge/QQ--group-558795330-26bcf5.svg)](https://github.com/rryqszq4/ngx_php7)
 
+![](https://raw.githubusercontent.com/rryqszq4/ngx_php7/master/docs/hello_world_performance.png)
+
 [ngx_php7](https://github.com/rryqszq4/ngx_php7) - Embedded php7 programming language for nginx-module.  
 [ngx_php](https://github.com/rryqszq4/ngx_php) - Embedded php5 script language for nginx-module.  
 
@@ -80,13 +81,15 @@ http {
             ';
         }
 
+        # curl /ngx_get?a=1&b=2
         location = /ngx_get {
             content_by_php '
                 echo "ngx::query_args()\n";
                 var_dump(ngx::query_args());
             ';
         }
 
+        # curl -d 'a=1&b=2' /ngx_post
         location = /ngx_post {
             content_by_php '
                 echo "ngx::post_args()\n";
@@ -106,18 +109,113 @@ http {
             default_type 'application/json;charset=UTF-8';
             content_by_php '
                 yield ngx_socket::connect("hq.sinajs.cn", 80);
-                yield ngx_socket::send("GET /list=s_sh000001 HTTP/1.0\r\nHost: hq.sinajs.cn\r\nConnection: close\r\n\r\n");
+                yield ngx_socket::send("GET /list=s_sh000001 HTTP/1.0\r\n
+                                        Host: hq.sinajs.cn\r\nConnection: close\r\n\r\n");
                 yield $ret = ngx_socket::recv(1024);
                 yield ngx_socket::close();
                 
                 var_dump($ret);
             ';
         }
 
+        location = /ngx_var {
+            set $a 1234567890;
+            content_by_php '
+                $a = ngx_var::get("a");
+                var_dump($a);
+            ';
+        }
+
     }
 }
 ```
 
+Test
+----
+Using the perl of [Test::Nginx](https://github.com/openresty/test-nginx) module to testing, searching and finding out problem in ngx_php7.
+```sh
+ngx_php7 test ...
+nginx version: nginx/1.10.3
+built by gcc 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04.3) 
+configure arguments: --prefix=/home/travis/build/rryqszq4/ngx_php7/build/nginx --with-ld-opt=-Wl,-rpath,/home/travis/build/rryqszq4/ngx_php7/build/php/lib --add-module=../../../ngx_php7/third_party/ngx_devel_kit --add-module=../../../ngx_php7
+t/001-hello.t ........... ok
+t/002-ini.t ............. ok
+t/004-ngx_request.t ..... ok
+t/005-ngx_log.t ......... ok
+t/006-ngx_sleep.t ....... ok
+t/007-ngx_socket.t ...... ok
+t/008-ngx_exit.t ........ ok
+t/009-ngx_query_args.t .. ok
+t/010-ngx_post_args.t ... ok
+t/011-ngx_constants.t ... ok
+t/012-function.t ........ ok
+t/013-class.t ........... ok
+t/014-ngx_var.t ......... ok
+All tests successful.
+Files=13, Tests=28,  5 wallclock secs ( 0.05 usr  0.02 sys +  1.26 cusr  0.22 csys =  1.55 CPU)
+Result: PASS
+```
+
+Directives
+----------
+* [php_ini_path](#php_ini_path)
+* [init_worker_by_php](#init_worker_by_php)
+* [rewrite_by_php](#rewrite_by_php)
+* [access_by_php](#access_by_php)
+* [content_by_php](#content_by_php)
+* [log_by_php](#log_by_php)
+* [header_filter_by_php](#header_filter_by_php)
+* [body_filter_by_php](#body_filter_by_php)
+
+php_ini_path
+------------
+* **syntax:** `php_ini_path`_`<php.ini file path>`_
+* **context:** `http`
+* **phase:** `loading-config`
+
+init_worker_by_php
+------------------
+* **syntax:** `init_worker_by_php`_`<php script code>`_
+* **context:** `http`
+* **phase:** `starting-worker`
+
+rewrite_by_php
+--------------
+* **syntax:** `rewrite_by_php`_`<php script code>`_
+* **context:** `http, server, location, location if`
+* **phase:** `rewrite`
+
+access_by_php
+-------------
+* **syntax:** `access_by_php`_`<php script code>`_
+* **context:** `http, server, location, location if`
+* **phase:** `access`
+
+content_by_php
+--------------
+* **syntax:** `content_by_php`_`<php script code>`_
+* **context:** `http, server, location, location if`
+* **phase:** `content`
+
+log_by_php
+----------
+* **syntax:** `log_by_php`_`<php script code>`_
+* **context:** `http, server, location, location if`
+* **phase:** `log`
+
+header_filter_by_php
+--------------------
+* **syntax:** `header_filter_by_php`_`<php script code>`_
+* **context:** `http, server, location, location if`
+* **phase:** `output-header-filter`
+
+body_filter_by_php
+------------------
+* **syntax:** `body_filter_by_php`_`<php script code>`_
+* **context:** `http, server, location, location if`
+* **phase:** `output-body-filter`
+
+
 Copyright and License
 ---------------------
 ```

config

@@ -1,50 +1,74 @@
-ngx_addon_name=ngx_http_php_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_php_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_php_module.c \
-                $ngx_addon_dir/src/ngx_http_php_core.c \
-                $ngx_addon_dir/src/ngx_http_php_directive.c \
-                $ngx_addon_dir/src/ngx_http_php_handler.c \
-                $ngx_addon_dir/src/ngx_http_php_request.c \
-                $ngx_addon_dir/src/ngx_http_php_zend_uthread.c \
-                $ngx_addon_dir/src/ngx_http_php_sleep.c \
-                $ngx_addon_dir/src/ngx_http_php_socket.c \
-                $ngx_addon_dir/src/ngx_http_php_util.c \
-                $ngx_addon_dir/src/ngx_php_debug.c \
-                $ngx_addon_dir/src/php/impl/php_ngx.c \
-                $ngx_addon_dir/src/php/impl/php_ngx_test.c \
-                $ngx_addon_dir/src/php/impl/php_ngx_track.c \
-                $ngx_addon_dir/src/php/impl/php_ngx_core.c \
-                $ngx_addon_dir/src/php/impl/php_ngx_log.c \
-                $ngx_addon_dir/src/php/impl/php_ngx_request.c \
-                $ngx_addon_dir/src/php/impl/php_ngx_generator.c \
-                $ngx_addon_dir/src/php/impl/php_ngx_socket.c \
-                "
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ngx_http_php_module.h \
-                $ngx_addon_dir/src/ngx_http_php_core.h \
-                $ngx_addon_dir/src/ngx_http_php_directive.h \
-                $ngx_addon_dir/src/ngx_http_php_handler.h \
-                $ngx_addon_dir/src/ngx_http_php_request.h \
-                $ngx_addon_dir/src/ngx_http_php_zend_uthread.h \
-                $ngx_addon_dir/src/ngx_http_php_sleep.h \
-                $ngx_addon_dir/src/ngx_http_php_socket.h \
-                $ngx_addon_dir/src/ngx_http_php_util.h \
-                $ngx_addon_dir/src/ngx_php_debug.h \
-                $ngx_addon_dir/src/php/impl/php_ngx.h \
-                $ngx_addon_dir/src/php/impl/php_ngx_test.h \
-                $ngx_addon_dir/src/php/impl/php_ngx_track.h \
-                $ngx_addon_dir/src/php/impl/php_ngx_core.h \
-                $ngx_addon_dir/src/php/impl/php_ngx_log.h \
-                $ngx_addon_dir/src/php/impl/php_ngx_request.h \
-                $ngx_addon_dir/src/php/impl/php_ngx_generator.h \
-                $ngx_addon_dir/src/php/impl/php_ngx_socket.h \
-                "
+ngx_addon_name=ngx_http_php7_module
 
-CORE_INCS="$CORE_INCS $PHP_INC $PHP_INC/main $PHP_INC/TSRM $PHP_INC/Zend $PHP_INC/ext $PHP_INC/ext/date/lib $PHP_INC/sapi/embed "
+NGX_PHP_SRCS="$ngx_addon_dir/src/ngx_http_php_module.c \
+              $ngx_addon_dir/src/ngx_http_php_core.c \
+              $ngx_addon_dir/src/ngx_http_php_directive.c \
+              $ngx_addon_dir/src/ngx_http_php_handler.c \
+              $ngx_addon_dir/src/ngx_http_php_request.c \
+              $ngx_addon_dir/src/ngx_http_php_zend_uthread.c \
+              $ngx_addon_dir/src/ngx_http_php_sleep.c \
+              $ngx_addon_dir/src/ngx_http_php_socket.c \
+              $ngx_addon_dir/src/ngx_http_php_util.c \
+              $ngx_addon_dir/src/ngx_http_php_variable.c \
+              $ngx_addon_dir/src/ngx_php_debug.c \
+              $ngx_addon_dir/src/php/impl/php_ngx.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_test.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_track.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_core.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_log.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_request.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_generator.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_socket.c \
+              $ngx_addon_dir/src/php/impl/php_ngx_var.c \
+              "
+NGX_PHP_DEPS="$ngx_addon_dir/src/ngx_http_php_module.h \
+              $ngx_addon_dir/src/ngx_http_php_core.h \
+              $ngx_addon_dir/src/ngx_http_php_directive.h \
+              $ngx_addon_dir/src/ngx_http_php_handler.h \
+              $ngx_addon_dir/src/ngx_http_php_request.h \
+              $ngx_addon_dir/src/ngx_http_php_zend_uthread.h \
+              $ngx_addon_dir/src/ngx_http_php_sleep.h \
+              $ngx_addon_dir/src/ngx_http_php_socket.h \
+              $ngx_addon_dir/src/ngx_http_php_util.h \
+              $ngx_addon_dir/src/ngx_http_php_variable.h \
+              $ngx_addon_dir/src/ngx_php_debug.h \
+              $ngx_addon_dir/src/php/impl/php_ngx.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_test.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_track.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_core.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_log.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_request.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_generator.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_socket.h \
+              $ngx_addon_dir/src/php/impl/php_ngx_var.h \
+              "
 
-CORE_LIBS="$CORE_LIBS `$PHP_BIN/php-config --ldflags` -L$PHP_LIB -lphp7 `$PHP_BIN/php-config --libs` "
+if [ -z "$PHP_CONFIG" ]; then
+  PHP_CONFIG=`which php-config`
+fi
 
-#CORE_INCS="$CORE_INCS /usr/local/php72/include/php /usr/local/php72/include/php/main /usr/local/php72/include/php/TSRM /usr/local/php72/include/php/Zend /usr/local/php72/include/php/ext /usr/local/php72/include/php/ext/date/lib /usr/local/php72/include/php/sapi/embed "
+if [ -z "$NGX_PHP_INCS" ]; then
+  NGX_PHP_INCS="`$PHP_CONFIG --includes | sed 's/-I//g'` `$PHP_CONFIG --include-dir`/sapi/embed "
+fi
+if [ -z "$NGX_PHP_LIBS" ]; then
+  NGX_PHP_LIBS="`$PHP_CONFIG --ldflags` `$PHP_CONFIG --libs` -lphp7 "
+fi
 
-#CORE_LIBS="$CORE_LIBS `/usr/local/php72/bin/php-config --ldflags` -L/usr/local/php72/lib -lphp7 `/usr/local/php72/bin/php-config --libs` "
+if [ $ngx_module_link = DYNAMIC ] ; then
+  ngx_module_type=HTTP_AUX_FILTER
+  ngx_module_name="ngx_http_php_module"
+  ngx_module_srcs="$NGX_PHP_SRCS"
+  ngx_module_deps="$NGX_PHP_DEPS"
+  ngx_module_incs="$NGX_PHP_INCS"
+  ngx_module_libs="$NGX_PHP_LIBS"
+
+  . auto/module
+else
+  HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_php_module"
+  NGX_ADDON_SRCS="$NGX_ADDON_SRCS $NGX_PHP_SRCS"
+  NGX_ADDON_DEPS="$NGX_ADDON_DEPS $NGX_PHP_DEPS"
+  CORE_INCS="$CORE_INCS $NGX_PHP_INCS "
+  CORE_LIBS="$CORE_LIBS $NGX_PHP_LIBS "
+fi
 
 have=NDK_SET_VAR . auto/have

docs/hello_world_performance.png

@@ -1,5 +1,5 @@
 /**
- *    Copyright(c) 2016-2017 rryqszq4
+ *    Copyright(c) 2016-2018 rryqszq4
  *
  *
  */

src/ngx_http_php_core.c

@@ -1,5 +1,5 @@
 /**
- *    Copyright(c) 2016-2017 rryqszq4
+ *    Copyright(c) 2016-2018 rryqszq4
  *
  *
  */
@@ -19,17 +19,17 @@
 
 extern ngx_http_request_t *ngx_php_request;
 
-typedef struct ngx_http_php_state_t {
+typedef struct ngx_http_php_state_s {
     unsigned php_init;
     unsigned php_shutdown;
 } ngx_http_php_state_t;
 
-typedef enum code_type_t {
+typedef enum code_type_s {
     NGX_HTTP_PHP_CODE_TYPE_FILE,
     NGX_HTTP_PHP_CODE_TYPE_STRING
 } code_type_t;
 
-typedef struct ngx_http_php_code_t {
+typedef struct ngx_http_php_code_s {
     union code {
         char *file;
         char *string;
@@ -48,18 +48,18 @@ typedef struct {
 } ngx_http_php_set_var_data_t;
 #endif
 
-typedef struct ngx_http_php_rputs_chain_list_t {
+typedef struct ngx_http_php_rputs_chain_list_s {
     ngx_chain_t **last;
     ngx_chain_t *out;
 } ngx_http_php_rputs_chain_list_t;
 
-typedef struct ngx_http_php_capture_node_t {
+typedef struct ngx_http_php_capture_node_s {
     ngx_str_t capture_uri;
     ngx_buf_t *capture_buf;
     ngx_str_t capture_str;
 } ngx_http_php_capture_node_t;
 
-typedef struct ngx_http_php_ctx_t {
+typedef struct ngx_http_php_ctx_s {
     ngx_http_php_rputs_chain_list_t *rputs_chain;
     size_t body_length;
     ngx_str_t request_body_ctx;