diff options
| author | Anatol Belski <ab@php.net> | 2014-12-02 09:14:22 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-02 09:15:11 +0100 |
| commit | b35555f6cdab496e6f41db5747a5f94f9454289c (patch) | |
| tree | c96a707debb9cc3b2161ee657865f007381111e8 /sapi/cgi/cgi_main.c | |
| parent | 1bcc7d919c2c1aff50966c450723c9d84090da99 (diff) | |
| download | php-git-b35555f6cdab496e6f41db5747a5f94f9454289c.tar.gz | |
fix datatype mismatches
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 5d3ee5bd8d..ea3d2ddf19 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -752,7 +752,7 @@ static void sapi_cgi_log_message(char *message TSRMLS_DC) /* {{{ php_cgi_ini_activate_user_config */ -static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len, int start TSRMLS_DC) +static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const char *doc_root, size_t doc_root_len, int start TSRMLS_DC) { char *ptr; user_config_cache_entry *new_entry, *entry; @@ -770,9 +770,9 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha /* Check whether cache entry has expired and rescan if it is */ if (request_time > entry->expires) { char *real_path = NULL; - int real_path_len; + size_t real_path_len; char *s1, *s2; - int s_len; + size_t s_len; /* Clear the expired config */ zend_hash_clean(entry->user_config); @@ -831,7 +831,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha static int sapi_cgi_activate(TSRMLS_D) { char *path, *doc_root, *server_name; - uint path_len, doc_root_len, server_name_len; + size_t path_len, doc_root_len, server_name_len; /* PATH_TRANSLATED should be defined at this stage but better safe than sorry :) */ if (!SG(request_info).path_translated) { @@ -898,7 +898,7 @@ static int sapi_cgi_activate(TSRMLS_D) doc_root = estrndup(doc_root, doc_root_len); zend_str_tolower(doc_root, doc_root_len); #endif - php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC); + php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, (doc_root_len > 0 && (doc_root_len - 1)) TSRMLS_CC); #ifdef PHP_WIN32 efree(doc_root); |