Skip to content

Commit

Permalink
Merge pull request #54 from rryqszq4/development
Browse files Browse the repository at this point in the history
[pr] release version to 0.0.19
  • Loading branch information
rryqszq4 authored Aug 26, 2019
2 parents d6882ec + a3624cf commit c23f623
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 2 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
ngx_php7 0.0.19 changes: 26 Aug 2019
* Add nginx directive php_keepalive.

* Add php impl ngx_socket_iskeepalive.

* Fixed parse failure when query_args is null.

* Fixed set end of request position error.

* Fixed error about php-7.4.0beta4.

* Document update.

ngx_php7 0.0.18 changes: 10 Jun 2019
* Fixed error about php-7.3.6

Expand Down
3 changes: 2 additions & 1 deletion config
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ NGX_PHP_SRCS="$ngx_addon_dir/src/ngx_http_php_module.c \
$ngx_addon_dir/src/php/impl/php_ngx_sockets.c \
$ngx_addon_dir/src/php/impl/php_ngx_header.c \
"
NGX_PHP_DEPS="$ngx_addon_dir/src/ngx_http_php_module.h \
NGX_PHP_DEPS="$ngx_addon_dir/src/ngx_http_php_version.h \
$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 \
Expand Down
3 changes: 2 additions & 1 deletion src/ngx_http_php_module.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <ngx_http.h>
#include <nginx.h>

#include "ngx_http_php_version.h"
#include "ngx_http_php_keepalive.h"

#if defined(NDK) && NDK
Expand All @@ -46,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


#define NGX_HTTP_PHP_MODULE_NAME "ngx_php"
#define NGX_HTTP_PHP_MODULE_VERSION "0.0.18"


#ifndef NGX_HTTP_PERMANENT_REDIRECT
# define NGX_HTTP_PERMANENT_REDIRECT 308
Expand Down
34 changes: 34 additions & 0 deletions src/ngx_http_php_version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
==============================================================================
Copyright (c) 2016-2019, rryqszq4 <[email protected]>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
==============================================================================
*/

#ifndef __NGX_HTTP_PHP_VERSION_H__
#define __NGX_HTTP_PHP_VERSION_H__

#define NGX_HTTP_PHP_MODULE_VERSION "0.0.19"

#endif

0 comments on commit c23f623

Please sign in to comment.