Browse Source

Update php-ngx to v0.22 (#5231)

* Update php-ngx to v0.22

* Add pcre jit
Joan Miquel 5 years ago
parent
commit
53c41def8d

+ 1 - 1
frameworks/PHP/php-ngx/app.php

@@ -3,7 +3,7 @@
 $pdo = new PDO('mysql:host=tfb-database;dbname=hello_world', 'benchmarkdbuser', 'benchmarkdbpass',
 $pdo = new PDO('mysql:host=tfb-database;dbname=hello_world', 'benchmarkdbuser', 'benchmarkdbpass',
             [PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
             [PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
             PDO::ATTR_EMULATE_PREPARES   => false]
             PDO::ATTR_EMULATE_PREPARES   => false]
-        );
+);
 
 
 $statement = $pdo->prepare('SELECT id,randomNumber FROM World WHERE id=?');
 $statement = $pdo->prepare('SELECT id,randomNumber FROM World WHERE id=?');
 $fortune   = $pdo->prepare('SELECT id,message FROM Fortune');
 $fortune   = $pdo->prepare('SELECT id,message FROM Fortune');

+ 1 - 0
frameworks/PHP/php-ngx/deploy/nginx.conf

@@ -4,6 +4,7 @@ error_log stderr error;
 #worker_rlimit_nofile 100000;
 #worker_rlimit_nofile 100000;
 #timer_resolution 1000ms;
 #timer_resolution 1000ms;
 daemon off;
 daemon off;
+pcre_jit on;
 
 
 events {
 events {
     worker_connections 65536;
     worker_connections 65536;

+ 1 - 0
frameworks/PHP/php-ngx/deploy/nginx_async.conf

@@ -4,6 +4,7 @@ error_log stderr error;
 #worker_rlimit_nofile 100000;
 #worker_rlimit_nofile 100000;
 #timer_resolution 1000ms;
 #timer_resolution 1000ms;
 daemon off;
 daemon off;
+pcre_jit on;
 
 
 events {
 events {
     worker_connections 65536;
     worker_connections 65536;

+ 1 - 0
frameworks/PHP/php-ngx/deploy/nginx_plain_php.conf

@@ -9,6 +9,7 @@ error_log stderr error;
 #worker_rlimit_nofile 100000;
 #worker_rlimit_nofile 100000;
 #timer_resolution 1000ms;
 #timer_resolution 1000ms;
 daemon off;
 daemon off;
+pcre_jit on;
 
 
 events {
 events {
     worker_connections 65536;
     worker_connections 65536;

+ 1 - 1
frameworks/PHP/php-ngx/php-ngx-async.dockerfile

@@ -13,7 +13,7 @@ ADD ./ ./
 
 
 ENV NGINX_VERSION=1.17.5
 ENV NGINX_VERSION=1.17.5
 
 
-RUN git clone -b v0.0.21 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
+RUN git clone -b v0.0.22 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
 
 
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \

+ 1 - 1
frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile

@@ -13,7 +13,7 @@ ADD ./ ./
 
 
 ENV NGINX_VERSION=1.17.5
 ENV NGINX_VERSION=1.17.5
 
 
-RUN git clone -b v0.0.21 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
+RUN git clone -b v0.0.22 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
 
 
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \

+ 1 - 1
frameworks/PHP/php-ngx/php-ngx.dockerfile

@@ -13,7 +13,7 @@ ADD ./ ./
 
 
 ENV NGINX_VERSION=1.17.5
 ENV NGINX_VERSION=1.17.5
 
 
-RUN git clone -b v0.0.21 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
+RUN git clone -b v0.0.22 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
 
 
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \