archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/master' into phpng

Browse source 
Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c
This commit is contained in:
Xinchen Hui 2014-07-18 15:52:52 +08:00
commit 110bf9c720
17 changed files with 333 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/rfc1867.c
View file

@ -904,7 +904,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
}
if (!strcasecmp(param, "MAX_FILE_SIZE")) {
#ifdef HAVE_ATOLL
max_file_size = atoll(value);
#else
max_file_size = strtoll(value, NULL, 10);
#endif
}
efree(param);