com php-src: Merge branch 'PHP-7.1' into PHP-7.2: sapi/litespee d/lsapi_main.c

From: Date: Wed, 02 Aug 2017 16:18:23 +0000
Subject: com php-src: Merge branch 'PHP-7.1' into PHP-7.2: sapi/litespee d/lsapi_main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98921@lists.php.net to get a copy of this message
Commit: 042ff13ca94b71a7b72bd0d082f47d5b90c2eb26 Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 2 Aug 2017 18:18:23 +0200 Parents: 91240073ea75d0e0d495572e85fbd31d704fab14 9871555090a661744505b549d4f808b5e4366e37 Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=042ff13ca94b71a7b72bd0d082f47d5b90c2eb26 Log: Merge branch 'PHP-7.1' into PHP-7.2 Changed paths: MM sapi/litespeed/lsapi_main.c Diff: diff --cc sapi/litespeed/lsapi_main.c index bbd55ea,cd192ef..b3471ca --- a/sapi/litespeed/lsapi_main..c +++ b/sapi/litespeed/lsapi_main.c @@@ -822,7 -769,7 +767,7 @@@ static int lsapi_activate_user_ini_walk void* next) { time_t request_time = sapi_get_request_time(); - uint32_t path_len, docroot_len; - uint docroot_len; ++ uint32_t docroot_len; int rc = SUCCESS; fn_activate_user_ini_chain_t *fn_next = next;

« previous php.cvs (#98921) next »