com php-src: fixed apache2 handler: sapi/apache2handler/apach e_config.c sapi/apache2handler/php_apache.h sapi/ apache2handler/sapi_apache2.c

Commit: 52afd818eb2b9f28bb2c7f493e957bcf0d788b1a Author: Anatol Belski <ab@php.net> Fri, 22 Nov 2013 11:39:33 +0100 Parents: 28cb72f4806ff654822c3c443309a57bfedd4e71 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=52afd818eb2b9f28bb2c7f493e957bcf0d788b1a Log: fixed apache2 handler Changed paths: M sapi/apache2handler/apache_config.c M sapi/apache2handler/php_apache.h M sapi/apache2handler/sapi_apache2.c Diff: diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index 2b51939..46f588f 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -185,7 +185,7 @@ void apply_config(void *dummy) { php_conf_rec *d = dummy; char *str; - uint str_len; + zend_str_size_uint str_len; php_dir_entry *data; for (zend_hash_internal_pointer_reset(&d->config); diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 8bc4608..9a1abc0 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; diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index b7f95e0..3b56c15 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -72,8 +72,8 @@ /* A way to specify the location of the php.ini dir in an apache directive */ char *apache2_php_ini_path_override = NULL; -static int -php_apache_sapi_ub_write(const char *str, uint str_length TSRMLS_DC) +static zend_str_size_int +php_apache_sapi_ub_write(const char *str, zend_str_size_uint str_length TSRMLS_DC) { request_rec *r; php_struct *ctx; @@ -180,8 +180,8 @@ php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) return SAPI_HEADER_SENT_SUCCESSFULLY; } -static int -php_apache_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC) +static apr_size_t +php_apache_sapi_read_post(char *buf, zend_str_size_uint count_bytes TSRMLS_DC) { apr_size_t len, tlen=0; php_struct *ctx = SG(server_context); @@ -212,7 +212,7 @@ php_apache_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC) return tlen; } -static struct stat* +static php_stat_t* php_apache_sapi_get_stat(TSRMLS_D) { php_struct *ctx = SG(server_context); @@ -270,7 +270,7 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC) php_struct *ctx = SG(server_context); const apr_array_header_t *arr = apr_table_elts(ctx->r->subprocess_env); char *key, *val; - int new_val_len; + zend_str_size_int new_val_len; APR_ARRAY_FOREACH_OPEN(arr, key, val) if (!val) { @@ -516,7 +516,7 @@ typedef struct { HashTable config; } php_conf_rec; char *str; - uint str_len; + zend_str_size_uint str_len; php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php5_module); for (zend_hash_internal_pointer_reset(&c->config);