From c081ce628f0d76d44784d7bb8e06428b06142ac0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:08:10 +0800 Subject: Bump year --- sapi/apache2handler/php_apache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/apache2handler/php_apache.h') diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 8bc46089d7..34846048b0 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 61c8af6a9d4376e5f233db775e4a0ebf47942830 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 23:39:22 +0200 Subject: ported apache handler --- sapi/apache2handler/php_apache.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sapi/apache2handler/php_apache.h') diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 34846048b0..10b4186306 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -25,6 +25,9 @@ #include "http_config.h" #include "http_core.h" +#include "php.h" +#include "main/php_streams.h" + /* Declare this so we can get to it from outside the sapi_apache2.c file */ extern module AP_MODULE_DECLARE_DATA php5_module; @@ -40,7 +43,7 @@ typedef struct php_struct { #if defined(NETWARE) && defined(CLIB_STAT_PATCH) struct stat_libc finfo; #else - struct stat finfo; + php_stat_t finfo; #endif /* Whether or not we've processed PHP in the output filters yet. */ int request_processed; -- cgit v1.2.1 From 4d997f63d98c663b2d9acccd3655572652f61c7d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 20:22:49 +0200 Subject: master renames phase 3 --- sapi/apache2handler/php_apache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/apache2handler/php_apache.h') diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 10b4186306..f1033c9539 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -43,7 +43,7 @@ typedef struct php_struct { #if defined(NETWARE) && defined(CLIB_STAT_PATCH) struct stat_libc finfo; #else - php_stat_t finfo; + zend_stat_t finfo; #endif /* Whether or not we've processed PHP in the output filters yet. */ int request_processed; -- cgit v1.2.1 From 5514b0b1ad1f68a8c2bd75f4ea3424d4a38df508 Mon Sep 17 00:00:00 2001 From: jfha73 Date: Thu, 18 Sep 2014 13:25:23 -0400 Subject: Update php_apache.h --- sapi/apache2handler/php_apache.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sapi/apache2handler/php_apache.h') diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index f1033c9539..f6f4f7a7c9 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -29,7 +29,7 @@ #include "main/php_streams.h" /* Declare this so we can get to it from outside the sapi_apache2.c file */ -extern module AP_MODULE_DECLARE_DATA php5_module; +extern module AP_MODULE_DECLARE_DATA php7_module; /* A way to specify the location of the php.ini dir in an apache directive */ extern char *apache2_php_ini_path_override; -- cgit v1.2.1