com php-src: more datatype fixes: main/SAPI.h sapi/cli/php_cl i_server.c

From: Date: Sun, 24 Nov 2013 23:44:33 +0000
Subject: com php-src: more datatype fixes: main/SAPI.h sapi/cli/php_cl i_server.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74034@lists.php.net to get a copy of this message
Commit: c6adc039a1c95c523af2ed811640b3e27dd7af74 Author: Anatol Belski <ab@php.net> Mon, 25 Nov 2013 00:44:33 +0100 Parents: a218f8f3a4c7d1532c595b4040f0a230c9786039 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c6adc039a1c95c523af2ed811640b3e27dd7af74 Log: more datatype fixes Changed paths: M main/SAPI.h M sapi/cli/php_cli_server.c Diff: diff --git a/main/SAPI.h b/main/SAPI.h index 1862618..ff9ff83 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -80,7 +80,7 @@ typedef struct { const char *request_method; char *query_string; char *cookie_data; - php_int_t content_length; + zend_int_t content_length; char *path_translated; char *request_uri; @@ -127,7 +127,7 @@ typedef struct _sapi_globals_struct { char *default_mimetype; char *default_charset; HashTable *rfc1867_uploaded_files; - php_int_t post_max_size; + zend_int_t post_max_size; int options; zend_bool sapi_started; double global_request_time; diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index ee7b668..2cab908 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -502,7 +502,7 @@ PHP_FUNCTION(apache_request_headers) /* {{{ */ static void add_response_header(sapi_header_struct *h, zval *return_value TSRMLS_DC) /* {{{ */ { char *s, *p; - int len; + ptrdiff_t len; ALLOCA_FLAG(use_heap) if (h->header_len > 0) {

« previous php.cvs (#74034) next »