com php-src: more for cli sapi: main/SAPI.h sapi/cli/php_cli .c sapi/cli/php_cli_server.c

From: Date: Wed, 16 Oct 2013 10:05:13 +0000
Subject: com php-src: more for cli sapi: main/SAPI.h sapi/cli/php_cli .c sapi/cli/php_cli_server.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73495@lists.php.net to get a copy of this message
Commit: 010b8114cc7d71c0957ff0a77e9d2c1cfe16e9f3 Author: Anatol Belski <ab@php.net> Mon, 29 Jul 2013 02:39:44 -0700 Parents: dec724e98dfaad3c684e20ac1c47579f76708b6f Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=010b8114cc7d71c0957ff0a77e9d2c1cfe16e9f3 Log: more for cli sapi Changed paths: M main/SAPI.h M sapi/cli/php_cli.c M sapi/cli/php_cli_server.c Diff: diff --git a/main/SAPI.h b/main/SAPI.h index 8b40c26..0e7f01f 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -226,7 +226,7 @@ struct _sapi_module_struct { int (*activate)(TSRMLS_D); int (*deactivate)(TSRMLS_D); - int (*ub_write)(const char *str, unsigned int str_length TSRMLS_DC); + zend_str_size_int (*ub_write)(const char *str, zend_str_size_uint str_length TSRMLS_DC); void (*flush)(void *server_context); struct stat *(*get_stat)(TSRMLS_D); char *(*getenv)(char *name, size_t name_len TSRMLS_DC); diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 164986f..c343f54 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1143,7 +1143,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */ } case PHP_MODE_REFLECTION_EXT_INFO: { - int len = strlen(reflection_what); + zend_str_size_int len = strlen(reflection_what); char *lcname = zend_str_tolower_dup(reflection_what, len); zend_module_entry *module; diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index ab4ac43..456e592 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -493,7 +493,7 @@ static int sapi_cli_server_startup(sapi_module_struct *sapi_module) /* {{{ */ return SUCCESS; } /* }}} */ -static int sapi_cli_server_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{ */ +static zend_str_size_int sapi_cli_server_ub_write(const char *str, zend_str_size_uint str_length TSRMLS_DC) /* {{{ */ { php_cli_server_client *client = SG(server_context); if (!client) { @@ -575,7 +575,7 @@ static char *sapi_cli_server_read_cookies(TSRMLS_D) /* {{{ */ return *val; } /* }}} */ -static int sapi_cli_server_read_post(char *buf, uint count_bytes TSRMLS_DC) /* {{{ */ +static zend_str_size_int sapi_cli_server_read_post(char *buf, uint count_bytes TSRMLS_DC) /* {{{ */ { php_cli_server_client *client = SG(server_context); if (client->request.content) { @@ -591,7 +591,7 @@ static int sapi_cli_server_read_post(char *buf, uint count_bytes TSRMLS_DC) /* { static void sapi_cli_server_register_variable(zval *track_vars_array, const char *key, const char *val TSRMLS_DC) /* {{{ */ { char *new_val = (char *)val; - uint new_val_len; + zend_str_size_uint new_val_len; if (sapi_module.input_filter(PARSE_SERVER, (char*)key, &new_val, strlen(val), &new_val_len TSRMLS_CC)) { php_register_variable_safe((char *)key, new_val, new_val_len, track_vars_array TSRMLS_CC); } @@ -988,7 +988,7 @@ static int php_cli_server_content_sender_send(php_cli_server_content_sender *sen switch (chunk->type) { case PHP_CLI_SERVER_CHUNK_HEAP: - nbytes_sent = send(fd, chunk->data.heap.p, chunk->data.heap.len, 0); + nbytes_sent = send(fd, chunk->data.heap.p, chunk->data.heap.len, 0); /* XXX on windows len is int */ if (nbytes_sent < 0) { *nbytes_sent_total = _nbytes_sent_total; return php_socket_errno(); @@ -1744,7 +1744,7 @@ static int php_cli_server_client_ctor(php_cli_server_client *client, php_cli_ser client->addr_len = addr_len; { char *addr_str = 0; - long addr_str_len = 0; + zend_str_size_long addr_str_len = 0; php_network_populate_name_from_sockaddr(addr, addr_len, &addr_str, &addr_str_len, NULL, 0 TSRMLS_CC); client->addr_str = pestrndup(addr_str, addr_str_len, 1); client->addr_str_len = addr_str_len;

« previous php.cvs (#73495) next »