Kalle Sommer Nielsen [Thu, 28 May 2015 12:30:18 +0000 (14:30 +0200)]
Fixed bug #69703 (Use __builtin_clzl on PowerPC) -- Patch by dja at axtens dot net
# Julien, even though 5.5 is still non security mode I don't think we should merge this patch but I leave the choice with you
Remi Collet [Thu, 28 May 2015 08:37:39 +0000 (10:37 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Relax a little this test, because random is not reliable
Remi Collet [Thu, 28 May 2015 08:35:19 +0000 (10:35 +0200)]
Relax a little this test, because random is not reliable
Usual values are 3500-3950, but >4000 can happen.
Ferenc Kovacs [Thu, 28 May 2015 00:09:12 +0000 (02:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
empty commit to trigger a github mirror
Ferenc Kovacs [Thu, 28 May 2015 00:08:48 +0000 (02:08 +0200)]
empty commit to trigger a github mirror
Ferenc Kovacs [Thu, 28 May 2015 00:05:50 +0000 (02:05 +0200)]
move to 5.6.11-dev
Xinchen Hui [Tue, 26 May 2015 08:24:39 +0000 (16:24 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 26 May 2015 08:24:18 +0000 (16:24 +0800)]
Fixed C89
Remi Collet [Sun, 24 May 2015 07:39:44 +0000 (09:39 +0200)]
NEWS
Remi Collet [Sun, 24 May 2015 07:39:20 +0000 (09:39 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed Bug #69479 GD fails to build with newer libvpx
Remi Collet [Sun, 24 May 2015 07:39:03 +0000 (09:39 +0200)]
NEWS
Remi Collet [Sun, 24 May 2015 07:37:12 +0000 (09:37 +0200)]
Fixed Bug #69479 GD fails to build with newer libvpx
From upstream https://github.com/libgd/libgd/commit/
d41eb72cd4545c394578332e5c102dee69e02ee8
Fix build with latest libvpx 1.4.0
These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
Anatol Belski [Sat, 23 May 2015 21:02:09 +0000 (23:02 +0200)]
updated NEWS
Anatol Belski [Sat, 23 May 2015 16:44:39 +0000 (18:44 +0200)]
increase the internal post data buffer
This brings speedup and fixes issues with var parsing. Default BUFSIZ
on Windows is 512 bytes which causes too much reallocation work.
Anatol Belski [Fri, 22 May 2015 19:27:19 +0000 (21:27 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Anatol Belski [Fri, 22 May 2015 19:25:52 +0000 (21:25 +0200)]
fix test
Sometimes the path is unixified, sometimes not, so better don't
care about the slash in this case.
Lior Kaplan [Fri, 22 May 2015 08:18:32 +0000 (11:18 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add entry for bug #69354, fixed in 5.5.25
Add entry about PCRE upgrade (rev
95fa7279)
Add CVE for bugs in 5.5.25
Lior Kaplan [Fri, 22 May 2015 08:17:01 +0000 (11:17 +0300)]
Add entry for bug #69354, fixed in 5.5.25
Lior Kaplan [Fri, 22 May 2015 08:15:36 +0000 (11:15 +0300)]
Add CVE for bugs in 5.6.9
Lior Kaplan [Fri, 22 May 2015 08:02:01 +0000 (11:02 +0300)]
Add entry about PCRE upgrade (rev
95fa7279)
Lior Kaplan [Fri, 22 May 2015 07:58:28 +0000 (10:58 +0300)]
Add CVE for bugs in 5.5.25
Remi Collet [Thu, 21 May 2015 12:07:02 +0000 (14:07 +0200)]
NEWS
Remi Collet [Thu, 21 May 2015 12:06:26 +0000 (14:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69680 (phar symlink in binary directory broken).
Make the phar symlink relative
Remi Collet [Thu, 21 May 2015 12:05:15 +0000 (14:05 +0200)]
Fixed bug #69680 (phar symlink in binary directory broken).
Relative symlink are better, as relative to link directory.
ponce [Thu, 21 May 2015 11:30:58 +0000 (13:30 +0200)]
Make the phar symlink relative
or we got a symlink pointing to the build files
thanks also to remicollet
Anatol Belski [Thu, 21 May 2015 08:56:14 +0000 (10:56 +0200)]
remove duplicated declaration, fix build
Anatol Belski [Thu, 21 May 2015 07:47:59 +0000 (09:47 +0200)]
updated NEWS
Anatol Belski [Thu, 21 May 2015 07:47:30 +0000 (09:47 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
added missing GLOB_BRACE support check
added SKIPIF section to test to make sure that GLOB_BRACE is supported
fix #69628: complex GLOB_BRACE fails on Windows
added PHPT to check for bug #69628
Anatol Belski [Thu, 21 May 2015 07:47:02 +0000 (09:47 +0200)]
updated NEWS
Christoph M. Becker [Wed, 20 May 2015 18:23:21 +0000 (20:23 +0200)]
added missing GLOB_BRACE support check
Christoph M. Becker [Wed, 20 May 2015 16:39:07 +0000 (18:39 +0200)]
added SKIPIF section to test to make sure that GLOB_BRACE is supported
Christoph M. Becker [Wed, 13 May 2015 21:47:54 +0000 (23:47 +0200)]
fix #69628: complex GLOB_BRACE fails on Windows
Christoph M. Becker [Wed, 13 May 2015 20:37:33 +0000 (22:37 +0200)]
added PHPT to check for bug #69628
Anatol Belski [Thu, 21 May 2015 06:21:53 +0000 (08:21 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix handling VAR vs VAR= in putenv
Anatol Belski [Thu, 21 May 2015 06:19:54 +0000 (08:19 +0200)]
fix handling VAR vs VAR= in putenv
using _putenv_s eliminates behavior diff in TS/NTS
Remi Collet [Wed, 20 May 2015 12:02:25 +0000 (14:02 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move test
Remi Collet [Wed, 20 May 2015 12:02:13 +0000 (14:02 +0200)]
move test
Remi Collet [Wed, 20 May 2015 06:30:44 +0000 (08:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix new test
Remi Collet [Wed, 20 May 2015 06:30:27 +0000 (08:30 +0200)]
fix new test
Remi Collet [Wed, 20 May 2015 06:11:55 +0000 (08:11 +0200)]
NEWS 5.6
Remi Collet [Wed, 20 May 2015 06:11:24 +0000 (08:11 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS 5.5
Fixed Bug #69667 segfault in php_pgsql_meta_data
fix test output (32bits)
Remi Collet [Wed, 20 May 2015 06:11:14 +0000 (08:11 +0200)]
NEWS 5.5
Remi Collet [Wed, 20 May 2015 06:08:41 +0000 (08:08 +0200)]
Fixed Bug #69667 segfault in php_pgsql_meta_data
Incomplete fix for #68741
Ferenc Kovacs [Thu, 14 May 2015 23:00:53 +0000 (01:00 +0200)]
fix NEWS
Remi Collet [Thu, 14 May 2015 08:28:59 +0000 (10:28 +0200)]
fix test output (32bits)
Ferenc Kovacs [Wed, 13 May 2015 13:29:08 +0000 (15:29 +0200)]
fix release dates for 5.6.9/5.6.10. spotted by @Jan-E on github
Julien Pauli [Wed, 13 May 2015 12:29:53 +0000 (14:29 +0200)]
Updated NEWS
Julien Pauli [Wed, 13 May 2015 12:29:29 +0000 (14:29 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 13 May 2015 12:29:02 +0000 (14:29 +0200)]
Updated NEWS
Julien Pauli [Wed, 13 May 2015 12:19:04 +0000 (14:19 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Close fd at the end, otherwise people complain
Add file descriptor caching to mcrypt_create_iv()
Leigh [Fri, 27 Mar 2015 19:14:33 +0000 (20:14 +0100)]
Close fd at the end, otherwise people complain
Even though it's closed when the process terminates!
Leigh [Fri, 27 Mar 2015 13:33:30 +0000 (14:33 +0100)]
Add file descriptor caching to mcrypt_create_iv()
This improves performance for applications that make repeated calls to
mcrypt_create_iv()
Julien Pauli [Wed, 13 May 2015 11:06:08 +0000 (13:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 13 May 2015 11:05:46 +0000 (13:05 +0200)]
Updated NEWS
Stanislav Malyshev [Tue, 12 May 2015 21:26:06 +0000 (14:26 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/standard/pack.c
Stanislav Malyshev [Tue, 12 May 2015 21:24:15 +0000 (14:24 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt
Stanislav Malyshev [Tue, 12 May 2015 19:37:28 +0000 (12:37 -0700)]
fix format
Stanislav Malyshev [Tue, 12 May 2015 19:17:54 +0000 (12:17 -0700)]
update NEWS
Julien Pauli [Tue, 12 May 2015 14:13:39 +0000 (16:13 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 May 2015 14:12:51 +0000 (16:12 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix for #66048
Julien Pauli [Tue, 12 May 2015 14:12:29 +0000 (16:12 +0200)]
Fix for #66048
Nikita Popov [Tue, 12 May 2015 13:08:12 +0000 (15:08 +0200)]
Fix bug #69599
Stanislav Malyshev [Mon, 11 May 2015 08:10:35 +0000 (01:10 -0700)]
Add test for bug #69522
Stanislav Malyshev [Mon, 11 May 2015 06:33:44 +0000 (23:33 -0700)]
Update tests
Stanislav Malyshev [Mon, 11 May 2015 06:06:08 +0000 (23:06 -0700)]
Fix bug #69522 - do not allow int overflow
Stanislav Malyshev [Sun, 10 May 2015 09:24:29 +0000 (02:24 -0700)]
Forgot test file
Stanislav Malyshev [Sun, 10 May 2015 09:20:08 +0000 (02:20 -0700)]
Fix bug #69403 and other int overflows
Stanislav Malyshev [Sun, 10 May 2015 06:13:06 +0000 (23:13 -0700)]
Fixed bug #69418 - more s->p fixes for filenames
Stanislav Malyshev [Sun, 10 May 2015 06:04:25 +0000 (23:04 -0700)]
Fixed bug #69364 - use smart_str to assemble strings
Stanislav Malyshev [Sun, 10 May 2015 01:56:25 +0000 (18:56 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix #48147 - implement manual handling of //IGNORE for broken libc
Stanislav Malyshev [Fri, 8 May 2015 07:03:54 +0000 (00:03 -0700)]
Fix #48147 - implement manual handling of //IGNORE for broken libc
Conflicts:
ext/iconv/iconv.c
Dmitry Stogov [Thu, 7 May 2015 09:16:40 +0000 (12:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)
Conflicts:
NEWS
Dmitry Stogov [Thu, 7 May 2015 09:14:14 +0000 (12:14 +0300)]
Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)
Remi Collet [Tue, 5 May 2015 09:23:13 +0000 (11:23 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Relax tests failing on i386 with new zic
Remi Collet [Tue, 5 May 2015 09:22:29 +0000 (11:22 +0200)]
Relax tests failing on i386 with new zic
Rasmus Lerdorf [Wed, 8 Apr 2015 16:55:55 +0000 (09:55 -0700)]
Remove SSLv3 test dependencies
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.
Conflicts:
ext/openssl/tests/session_meta_capture.phpt
Xinchen Hui [Tue, 5 May 2015 03:06:23 +0000 (11:06 +0800)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Xinchen Hui [Tue, 5 May 2015 03:06:14 +0000 (11:06 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 5 May 2015 03:06:04 +0000 (11:06 +0800)]
Update version
Anatol Belski [Mon, 4 May 2015 13:59:14 +0000 (15:59 +0200)]
add config vars for phpize
Xinchen Hui [Mon, 4 May 2015 11:22:22 +0000 (19:22 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 4 May 2015 11:21:54 +0000 (19:21 +0800)]
Saving the latter checking in most cases
Xinchen Hui [Mon, 4 May 2015 02:34:48 +0000 (10:34 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 4 May 2015 02:34:39 +0000 (10:34 +0800)]
Update NEWS
John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]
Fix uninitialized value with extension traits
John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]
Fix uninitialized value with extension traits
Stanislav Malyshev [Thu, 30 Apr 2015 05:04:20 +0000 (22:04 -0700)]
Fix bug #69453 - don't try to cut empty string
Stanislav Malyshev [Thu, 30 Apr 2015 04:57:33 +0000 (21:57 -0700)]
Fix bug #69545 - avoid overflow when reading list
Stanislav Malyshev [Thu, 30 Apr 2015 05:28:04 +0000 (22:28 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Upgrade to PCRE 8.37 due to various bugfixes
Stanislav Malyshev [Thu, 30 Apr 2015 05:27:21 +0000 (22:27 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Upgrade to PCRE 8.37 due to various bugfixes
Stanislav Malyshev [Thu, 30 Apr 2015 05:25:02 +0000 (22:25 -0700)]
Upgrade to PCRE 8.37 due to various bugfixes
Ferenc Kovacs [Wed, 29 Apr 2015 22:01:55 +0000 (00:01 +0200)]
5.6.10 will be next
Julien Pauli [Wed, 29 Apr 2015 09:21:18 +0000 (11:21 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.26 now
Conflicts:
configure.in
main/php_version.h
Julien Pauli [Wed, 29 Apr 2015 09:16:06 +0000 (11:16 +0200)]
5.5.26 now
Derick Rethans [Tue, 28 Apr 2015 23:28:56 +0000 (00:28 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 28 Apr 2015 23:28:50 +0000 (00:28 +0100)]
Use new structures for tzdb header here as well
Derick Rethans [Tue, 28 Apr 2015 23:27:55 +0000 (00:27 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 28 Apr 2015 23:25:29 +0000 (00:25 +0100)]
This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync
Derick Rethans [Tue, 28 Apr 2015 23:09:00 +0000 (00:09 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 28 Apr 2015 23:08:28 +0000 (00:08 +0100)]
Split header reading in 32bit and 64bit variants.
We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.
projects / php / log