diff options
author | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
commit | 79f888a602db3814a6ab03183eff6375bfe9234a (patch) | |
tree | f1b6d1fb76ca4d613a5cc1b551057dac33d3f585 /sapi/apache2handler/php_functions.c | |
parent | da35db3ec5fc4b27087292c067a6ea1d0f77bf8f (diff) | |
parent | 411b920a6f8d53025caddb30895b27d04a3576b4 (diff) | |
download | php-git-79f888a602db3814a6ab03183eff6375bfe9234a.tar.gz |
Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGE
* weltling/master: (725 commits)
fix zpp
fixed array_pad()
fix zpp
fix zpp
fix zpp
fix zpp and a bit more
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fixed the test
...
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
-rw-r--r-- | sapi/apache2handler/php_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 4bc8fe8872..675bb78371 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -109,9 +109,9 @@ PHP_FUNCTION(virtual) /* }}} */ #define ADD_LONG(name) \ - add_property_long(return_value, #name, rr->name) + add_property_int(return_value, #name, rr->name) #define ADD_TIME(name) \ - add_property_long(return_value, #name, apr_time_sec(rr->name)); + add_property_int(return_value, #name, apr_time_sec(rr->name)); #define ADD_STRING(name) \ if (rr->name) add_property_string(return_value, #name, (char *) rr->name) |