com php-src: ported apache handler: sapi/apache2handler/php _apache.h sapi/apache2handler/sapi_apache2.c

From: Date: Tue, 19 Aug 2014 21:39:22 +0000
Subject: com php-src: ported apache handler: sapi/apache2handler/php _apache.h sapi/apache2handler/sapi_apache2.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80739@lists.php.net to get a copy of this message
Commit: 61c8af6a9d4376e5f233db775e4a0ebf47942830 Author: Anatol Belski <ab@php.net> Tue, 19 Aug 2014 23:39:22 +0200 Parents: 21f623e945dc8d167a5b0db97a8228644eeb2ffa Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=61c8af6a9d4376e5f233db775e4a0ebf47942830 Log: ported apache handler Changed paths: M sapi/apache2handler/php_apache.h M sapi/apache2handler/sapi_apache2.c Diff: diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 3484604..10b4186 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 ebcc3e9..10b61cc 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) {

« previous php.cvs (#80739) next »