com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/session/session.c ext /standard/head.c ext/standard/head.h
sapi/cli/php_cli _server.c

Commit: e98d429cc329d13a0451ad7ce11f93bd7d54d1a8 Author: Anatol Belski <ab@php.net> Wed, 2 Jul 2014 10:30:36 +0200 Parents: 84876850ff3e50ee7b85abc7261bdf9038d65e4b 088eedfaa186e79f6f86b814f50efc947350bf88 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e98d429cc329d13a0451ad7ce11f93bd7d54d1a8 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 * origin/master: (25 commits) Better fix for bug #67072 with more BC provisions Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) Fix bug #67349: Locale::parseLocale Double Free Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit Fix https://github.com/krakjoe/phpdbg/issues/91 Update copyright year to 2014 Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Fixed bug #67399 (putenv with empty variable may lead to crash) Remove superfluous echos. Remove usage of pointless COOKIE_SET_COOKIE constant.. Test Added support for parsing ssl certificates using GeneralizedTime format. Fix align indentation ... Conflicts: ext/standard/head.c Bugs: https://bugs.php.net/67072 https://bugs.php.net/67498 https://bugs.php.net/67492 https://bugs.php.net/67397 https://bugs.php.net/67349 https://bugs.php.net/67399 Changed paths: MM ext/session/session.c MM ext/standard/head.c MM ext/standard/head.h MM sapi/cli/php_cli_server.c Diff: diff --cc ext/standard/head.c index 5c44886,0316903..2a6b288 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@@ -138,8 -138,8 +138,8 @@@ PHPAPI int php_setcookie(char *name, ph strlcat(cookie, dt, len + 100); efree(dt); - snprintf(tsdelta, sizeof(tsdelta), "%li", (long) difftime(expires, time(NULL))); + snprintf(tsdelta, sizeof(tsdelta), "%pd", (php_int_t) difftime(expires, time(NULL))); - strlcat(cookie, "; Max-Age=", len + 100); + strlcat(cookie, COOKIE_MAX_AGE, len + 100); strlcat(cookie, tsdelta, len + 100); } }