summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/sapi_apache2.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-19 23:39:22 +0200
committerAnatol Belski <ab@php.net>2014-08-19 23:39:22 +0200
commit61c8af6a9d4376e5f233db775e4a0ebf47942830 (patch)
tree25f24f8301f1cbe72611016ca81b79928c21429a /sapi/apache2handler/sapi_apache2.c
parent21f623e945dc8d167a5b0db97a8228644eeb2ffa (diff)
downloadphp-git-61c8af6a9d4376e5f233db775e4a0ebf47942830.tar.gz
ported apache handler
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
-rw-r--r--sapi/apache2handler/sapi_apache2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index ebcc3e9bc9..10b61cc2a3 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 php_size_t
+php_apache_sapi_ub_write(const char *str, php_size_t 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, php_size_t 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;
+ php_size_t new_val_len;
APR_ARRAY_FOREACH_OPEN(arr, key, val)
if (!val) {