]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 10 Apr 2017 21:51:27 +0000 (23:51 +0200)]
Move call/recv splitting into correct branch
Sammy Kaye Powers [Mon, 10 Apr 2017 15:43:33 +0000 (10:43 -0500)]
Remove spurious `CG(context).in_finally` dingleberry
Nikita Popov [Mon, 10 Apr 2017 20:26:42 +0000 (22:26 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 10 Apr 2017 20:26:35 +0000 (22:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 10 Apr 2017 20:26:14 +0000 (22:26 +0200)]
Forgot to commit test file...
Nikita Popov [Fri, 17 Mar 2017 22:45:05 +0000 (23:45 +0100)]
Implement jumptable optimization
Nikita Popov [Fri, 17 Mar 2017 20:37:57 +0000 (21:37 +0100)]
Support more than two successors in opcache CFG
Nikita Popov [Mon, 10 Apr 2017 20:12:05 +0000 (22:12 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 10 Apr 2017 20:11:47 +0000 (22:11 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 10 Apr 2017 20:09:34 +0000 (22:09 +0200)]
Fix JMPZ+JMP => NOP+JMP optimization
Joe Watkins [Mon, 10 Apr 2017 11:51:17 +0000 (12:51 +0100)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
Joe Watkins [Mon, 10 Apr 2017 11:51:00 +0000 (12:51 +0100)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Update NEWS
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
Joe Watkins [Mon, 10 Apr 2017 11:50:31 +0000 (12:50 +0100)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Update NEWS
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
intergarte furher newer flag in FindFirstFileEx for win7+ only
Joe Watkins [Mon, 10 Apr 2017 11:49:54 +0000 (12:49 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
Joe Watkins [Mon, 10 Apr 2017 11:49:15 +0000 (12:49 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
Joe Watkins [Mon, 10 Apr 2017 11:48:51 +0000 (12:48 +0100)]
Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
Xinchen Hui [Mon, 10 Apr 2017 11:03:38 +0000 (19:03 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
Xinchen Hui [Mon, 10 Apr 2017 11:03:27 +0000 (19:03 +0800)]
Update NEWS
Xinchen Hui [Mon, 10 Apr 2017 11:03:09 +0000 (19:03 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
Xinchen Hui [Mon, 10 Apr 2017 11:02:50 +0000 (19:02 +0800)]
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
Anatol Belski [Sun, 9 Apr 2017 16:14:10 +0000 (18:14 +0200)]
intergarte furher newer flag in FindFirstFileEx for win7+ only
Joe Watkins [Mon, 10 Apr 2017 07:07:52 +0000 (08:07 +0100)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
Joe Watkins [Mon, 10 Apr 2017 07:07:24 +0000 (08:07 +0100)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Fixed condition check
Fixed issue #2466 Invalid integer constant expression error in php.h
Joe Watkins [Mon, 10 Apr 2017 07:06:52 +0000 (08:06 +0100)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
Joe Watkins [Mon, 10 Apr 2017 07:06:28 +0000 (08:06 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74400 (phpdbg comparing socket function to int)
Joe Watkins [Mon, 10 Apr 2017 07:06:11 +0000 (08:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74400 (phpdbg comparing socket function to int)
Joe Watkins [Mon, 10 Apr 2017 07:05:31 +0000 (08:05 +0100)]
Fixed bug #74400 (phpdbg comparing socket function to int)
Xinchen Hui [Mon, 10 Apr 2017 06:49:13 +0000 (14:49 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed condition check
Fixed condition check
another place
Conflicts:
ext/mcrypt/mcrypt.c
Xinchen Hui [Mon, 10 Apr 2017 06:48:31 +0000 (14:48 +0800)]
Fixed condition check
Xinchen Hui [Mon, 10 Apr 2017 06:47:42 +0000 (14:47 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed condition check
Xinchen Hui [Mon, 10 Apr 2017 06:47:24 +0000 (14:47 +0800)]
Fixed condition check
Xinchen Hui [Mon, 10 Apr 2017 06:42:48 +0000 (14:42 +0800)]
another place
Xinchen Hui [Mon, 10 Apr 2017 06:41:59 +0000 (14:41 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed issue #2466 Invalid integer constant expression error in php.h
Xinchen Hui [Mon, 10 Apr 2017 06:41:48 +0000 (14:41 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed issue #2466 Invalid integer constant expression error in php.h
Xinchen Hui [Mon, 10 Apr 2017 06:41:29 +0000 (14:41 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
fix news
Fix of Bug #74383: Wrong reflection on Phar::running
Xinchen Hui [Mon, 10 Apr 2017 06:40:44 +0000 (14:40 +0800)]
Fixed issue #2466 Invalid integer constant expression error in php.h
Joe Watkins [Mon, 10 Apr 2017 05:46:15 +0000 (06:46 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix news
Joe Watkins [Mon, 10 Apr 2017 05:45:28 +0000 (06:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix news
Joe Watkins [Mon, 10 Apr 2017 05:44:20 +0000 (06:44 +0100)]
fix news
Mitch Hagstrand [Fri, 7 Apr 2017 23:52:12 +0000 (16:52 -0700)]
Fix for Bug 74196: PharData->decompress() does not correctly support dot names
1. Fixed phar_rename_archive to no longer remove everything after a "." in the filename
2. Removed unused "zend_bool compress" parameter
3. Added Test
4. Fixed tests that had a work around for this problem
Joe Watkins [Mon, 10 Apr 2017 05:33:01 +0000 (06:33 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix of Bug #74383: Wrong reflection on Phar::running
Joe Watkins [Mon, 10 Apr 2017 05:28:43 +0000 (06:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix of Bug #74383: Wrong reflection on Phar::running
Mitch Hagstrand [Sun, 9 Apr 2017 22:30:35 +0000 (15:30 -0700)]
Fix of Bug #74383: Wrong reflection on Phar::running
Mitch Hagstrand [Sun, 9 Apr 2017 22:30:35 +0000 (15:30 -0700)]
Fix of Bug #74383: Wrong reflection on Phar::running
Xinchen Hui [Mon, 10 Apr 2017 03:49:44 +0000 (11:49 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Add NEWS
Resolve bug #74188 (undefined statics raising with ?? operator)
Fixed bug #72071: Prevent Max-Age from being negative
Update NEWS with OpenSSL 1.1.0 support info
Add OpenSSL 1.1.0 support to PHP 7.0
Xinchen Hui [Mon, 10 Apr 2017 03:47:38 +0000 (11:47 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
Missed NEWS
Conflicts:
ext/fileinfo/libmagic.patch
Xinchen Hui [Mon, 10 Apr 2017 03:45:12 +0000 (11:45 +0800)]
Update NEWS
Xinchen Hui [Mon, 10 Apr 2017 03:44:50 +0000 (11:44 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
Xinchen Hui [Mon, 10 Apr 2017 03:44:41 +0000 (11:44 +0800)]
Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
Xinchen Hui [Mon, 10 Apr 2017 03:22:37 +0000 (11:22 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Missed NEWS
Xinchen Hui [Mon, 10 Apr 2017 03:22:08 +0000 (11:22 +0800)]
Missed NEWS
Nikita Popov [Sun, 9 Apr 2017 13:57:26 +0000 (15:57 +0200)]
Merge branch 'PHP-7.1'
[skip ci]
Nikita Popov [Sun, 9 Apr 2017 13:57:15 +0000 (15:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
[skip ci]
Nikita Popov [Sun, 9 Apr 2017 13:54:32 +0000 (15:54 +0200)]
Add NEWS entries
[skip ci]
Nikita Popov [Sun, 9 Apr 2017 13:52:37 +0000 (15:52 +0200)]
Add NEWS
Nikita Popov [Sun, 9 Apr 2017 13:35:56 +0000 (15:35 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 9 Apr 2017 13:35:44 +0000 (15:35 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Thomas Punt [Sat, 1 Apr 2017 14:37:48 +0000 (15:37 +0100)]
Resolve bug #74188 (undefined statics raising with ?? operator)
Nikita Popov [Sun, 9 Apr 2017 11:15:04 +0000 (13:15 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 9 Apr 2017 11:14:45 +0000 (13:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Craig Duncan [Mon, 3 Apr 2017 11:31:26 +0000 (12:31 +0100)]
Fixed bug #72071: Prevent Max-Age from being negative
Nikita Popov [Sun, 9 Apr 2017 10:56:41 +0000 (12:56 +0200)]
Merge branch 'PHP-7.1'
andrewnester [Fri, 24 Mar 2017 16:23:15 +0000 (19:23 +0300)]
Fixed #74298 - IntlDateFormatter->format() doesn't return microseconds/fractions
Edgar R. Sandi [Sat, 1 Apr 2017 04:26:09 +0000 (01:26 -0300)]
pull-request/2456:
increase test coverage in calendar extension
consistent warnings in calendar extension
Stephan Muggli [Fri, 7 Apr 2017 10:35:56 +0000 (12:35 +0200)]
Fix typo in NEWS
Anatol Belski [Fri, 7 Apr 2017 19:12:52 +0000 (21:12 +0200)]
Switch to FindFirstFileEx with basic info level
That omits querying of short names, thus improving perf.
Jakub Zelenka [Fri, 7 Apr 2017 18:30:28 +0000 (19:30 +0100)]
Merge branch 'PHP-7.1'
Jakub Zelenka [Fri, 7 Apr 2017 18:29:46 +0000 (19:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Fri, 7 Apr 2017 18:27:25 +0000 (19:27 +0100)]
Update NEWS with OpenSSL 1.1.0 support info
Jakub Zelenka [Fri, 7 Apr 2017 18:20:11 +0000 (19:20 +0100)]
Add OpenSSL 1.1.0 support to PHP 7.0
Xinchen Hui [Fri, 7 Apr 2017 08:15:44 +0000 (16:15 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74353 (Segfault when killing within bash script trap code)
Xinchen Hui [Fri, 7 Apr 2017 08:15:36 +0000 (16:15 +0800)]
Fixed bug #74353 (Segfault when killing within bash script trap code)
Xinchen Hui [Fri, 7 Apr 2017 07:21:57 +0000 (15:21 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Remove unused var
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
Xinchen Hui [Fri, 7 Apr 2017 07:21:44 +0000 (15:21 +0800)]
Update NEWS
Xinchen Hui [Fri, 7 Apr 2017 07:21:19 +0000 (15:21 +0800)]
Remove unused var
Xinchen Hui [Fri, 7 Apr 2017 07:20:53 +0000 (15:20 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
Yussuf Khalil [Wed, 5 Apr 2017 18:57:03 +0000 (20:57 +0200)]
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
Remi Collet [Wed, 5 Apr 2017 05:39:39 +0000 (07:39 +0200)]
zip ext is 1.14.0
Anatol Belski [Tue, 4 Apr 2017 14:32:29 +0000 (16:32 +0200)]
external libzip neither requires zlib.h nor lib
Anatol Belski [Tue, 4 Apr 2017 14:25:10 +0000 (16:25 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Revert "extend skip section"
Anatol Belski [Tue, 4 Apr 2017 14:23:49 +0000 (16:23 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "extend skip section"
Anatol Belski [Tue, 4 Apr 2017 14:21:23 +0000 (16:21 +0200)]
Revert "extend skip section"
This reverts commit
51360480649628a58b4c06940b6c4ad49ff31186 .
This is not needed anymore wrt dst handling fix
Anatol Belski [Mon, 3 Apr 2017 14:30:40 +0000 (16:30 +0200)]
missing bits for php_sys_stat_ex so everything is handled with wide chars
rename to pathw_len
Dmitry Stogov [Mon, 3 Apr 2017 13:57:29 +0000 (16:57 +0300)]
Expose zend_ssa_is_no_val_use()
Anatol Belski [Mon, 3 Apr 2017 13:29:56 +0000 (15:29 +0200)]
add existence check for clang lib dir and improve on x86
Anatol Belski [Mon, 3 Apr 2017 13:22:59 +0000 (15:22 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix possible out of bounds buffer access
Anatol Belski [Mon, 3 Apr 2017 13:22:04 +0000 (15:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix possible out of bounds buffer access
Anatol Belski [Mon, 3 Apr 2017 13:20:32 +0000 (15:20 +0200)]
fix possible out of bounds buffer access
Anatol Belski [Mon, 3 Apr 2017 12:25:37 +0000 (14:25 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix buffer overflow
Anatol Belski [Mon, 3 Apr 2017 12:22:23 +0000 (14:22 +0200)]
fix buffer overflow
Anatol Belski [Mon, 3 Apr 2017 09:46:51 +0000 (11:46 +0200)]
basic ASAN suport for clang on Windows
fix makefile generation for non clang
rename option
Anatol Belski [Sun, 2 Apr 2017 15:55:23 +0000 (17:55 +0200)]
hide clang warnings about unimplemented cli options
Anatol Belski [Sun, 2 Apr 2017 14:39:46 +0000 (16:39 +0200)]
extend manifest with long path compat info
Anatol Belski [Fri, 31 Mar 2017 18:18:58 +0000 (20:18 +0200)]
do compare on wchar's
Nikita Popov [Sun, 2 Apr 2017 11:45:08 +0000 (13:45 +0200)]
Update CONTRIBUTING
Update version numbers, point out not to PR against release branches,
point out rebase over merge.
[ci skip]
Nikita Popov [Sun, 2 Apr 2017 11:31:07 +0000 (13:31 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 2 Apr 2017 11:30:35 +0000 (13:30 +0200)]
Fixed bug #74340
Nikita Popov [Sun, 2 Apr 2017 11:20:14 +0000 (13:20 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 2 Apr 2017 11:19:32 +0000 (13:19 +0200)]
Fixed bug #74361
Nikita Popov [Sat, 1 Apr 2017 23:08:42 +0000 (01:08 +0200)]
Merge branch 'PHP-7.1'