diff options
| author | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
| commit | f62ad3bc578eb7a5494b7816f31dc31227483aed (patch) | |
| tree | bd0302ba9597655058c1526cfed29cba1df83601 /sapi | |
| parent | dba27372ec59af3f0ecc02b264b9c3a620b1a5bf (diff) | |
| parent | 178363cbff9cc2366b75eb11fd61473da238f7c6 (diff) | |
| download | php-git-f62ad3bc578eb7a5494b7816f31dc31227483aed.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 6 | ||||
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index da20072b14..8712b2b958 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -70,9 +70,9 @@ void php_ap2_register_hook(apr_pool_t *p); #define APR_ARRAY_FOREACH_CLOSE() }} typedef struct { - long engine; - long xbithack; - long last_modified; + zend_bool engine; + zend_bool xbithack; + zend_bool last_modified; } php_apache2_info_struct; extern zend_module_entry apache2_module_entry; diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 5225090c13..2eb6a64c00 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -532,9 +532,9 @@ static const zend_function_entry apache_functions[] = { }; PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("xbithack", "0", PHP_INI_ALL, OnUpdateLong, xbithack, php_apache2_info_struct, php_apache2_info) - STD_PHP_INI_ENTRY("engine", "1", PHP_INI_ALL, OnUpdateLong, engine, php_apache2_info_struct, php_apache2_info) - STD_PHP_INI_ENTRY("last_modified", "0", PHP_INI_ALL, OnUpdateLong, last_modified, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY("xbithack", "0", PHP_INI_ALL, OnUpdateBool, xbithack, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY("engine", "1", PHP_INI_ALL, OnUpdateBool, engine, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY("last_modified", "0", PHP_INI_ALL, OnUpdateBool, last_modified, php_apache2_info_struct, php_apache2_info) PHP_INI_END() static PHP_MINIT_FUNCTION(apache) |