]>
granicus.if.org Git - php/log
Stanislav Malyshev [Thu, 8 May 2014 08:08:55 +0000 (01:08 -0700)]
make release tags not fail Travis CI
Stanislav Malyshev [Thu, 8 May 2014 08:01:34 +0000 (01:01 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix memory leak in TSRM
Stanislav Malyshev [Thu, 8 May 2014 08:01:15 +0000 (01:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix memory leak in TSRM
Stanislav Malyshev [Thu, 8 May 2014 08:00:51 +0000 (01:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix memory leak in TSRM
Stanislav Malyshev [Wed, 7 May 2014 20:28:03 +0000 (13:28 -0700)]
Fix memory leak in TSRM
Stanislav Malyshev [Wed, 7 May 2014 20:28:03 +0000 (13:28 -0700)]
Fix memory leak in TSRM
Daniel Lowrey [Wed, 7 May 2014 14:13:31 +0000 (08:13 -0600)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Allow crypto_method context value in stream_socket_enable_crypto()
Daniel Lowrey [Wed, 7 May 2014 13:55:40 +0000 (07:55 -0600)]
Bug #67224: stream_socket_enable_crypto()
- Allow crypto_method context value in stream_socket_enable_crypto()
- As of 5.6.x stream crypto type may be specified in the SSL context,
making the $crypto_type parameter to stream_socket_enable_crypto()
optional. This commit checks for a crypto type in the context prior
to erroring out.
- Update NEWS/UPGRADING
Ferenc Kovacs [Tue, 6 May 2014 23:03:31 +0000 (01:03 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed test (it requires ext/hash)
Conflicts:
ext/session/tests/031.phpt
Ferenc Kovacs [Tue, 6 May 2014 23:00:01 +0000 (01:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test (it requires ext/hash)
Ferenc Kovacs [Tue, 6 May 2014 22:55:05 +0000 (00:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed test (it requires ext/hash)
Dmitry Stogov [Thu, 10 Apr 2014 08:14:11 +0000 (12:14 +0400)]
Fixed test (it requires ext/hash)
Ferenc Kovacs [Tue, 6 May 2014 22:39:57 +0000 (00:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
Ferenc Kovacs [Tue, 6 May 2014 22:38:57 +0000 (00:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
Ferenc Kovacs [Tue, 6 May 2014 22:38:32 +0000 (00:38 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
Dmitry Stogov [Fri, 11 Apr 2014 08:43:35 +0000 (12:43 +0400)]
Fixed tests (they might fail from time to time because of session GC)
Martin Jansen [Tue, 6 May 2014 20:08:52 +0000 (22:08 +0200)]
Fix typo
Martin Jansen [Tue, 6 May 2014 19:34:10 +0000 (21:34 +0200)]
This test requires the hash extension.
Michael Wallner [Tue, 6 May 2014 10:39:34 +0000 (12:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Michael Wallner [Tue, 6 May 2014 10:39:23 +0000 (12:39 +0200)]
NEWS
Michael Wallner [Tue, 6 May 2014 10:36:55 +0000 (12:36 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
XFAIL-- for bug #67198
remove useless indirection
fix bug #67198 (php://input regression)
Michael Wallner [Tue, 6 May 2014 10:19:53 +0000 (12:19 +0200)]
XFAIL-- for bug #67198
Michael Wallner [Tue, 6 May 2014 10:00:32 +0000 (12:00 +0200)]
remove useless indirection
the stream was initialized within the ops
in a prior version of the slim_post_data patch
Michael Wallner [Tue, 6 May 2014 09:59:41 +0000 (11:59 +0200)]
fix bug #67198 (php://input regression)
Michael Wallner [Tue, 6 May 2014 10:19:53 +0000 (12:19 +0200)]
XFAIL-- for bug #67198
Michael Wallner [Tue, 6 May 2014 10:00:32 +0000 (12:00 +0200)]
remove useless indirection
the stream was initialized within the ops
in a prior version of the slim_post_data patch
Michael Wallner [Tue, 6 May 2014 09:59:41 +0000 (11:59 +0200)]
fix bug #67198 (php://input regression)
Andrey Hristov [Tue, 6 May 2014 09:17:29 +0000 (12:17 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Tue, 6 May 2014 08:36:03 +0000 (11:36 +0300)]
rename a constant - old name to new name
Ferenc Kovacs [Mon, 5 May 2014 14:25:38 +0000 (16:25 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
test for bug #67198
Ferenc Kovacs [Mon, 5 May 2014 14:25:15 +0000 (16:25 +0200)]
test for bug #67198
Anatol Belski [Sun, 4 May 2014 22:51:40 +0000 (00:51 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed ZEND_DEBUG usage
Anatol Belski [Sun, 4 May 2014 22:50:51 +0000 (00:50 +0200)]
fixed ZEND_DEBUG usage
Anatol Belski [Sun, 4 May 2014 19:34:36 +0000 (21:34 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libmagic.patch
Anatol Belski [Sun, 4 May 2014 19:34:17 +0000 (21:34 +0200)]
updated libmagic.patch
Anatol Belski [Sun, 4 May 2014 19:27:37 +0000 (21:27 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
added missing stdint header, bug #66907
Anatol Belski [Sun, 4 May 2014 19:26:53 +0000 (21:26 +0200)]
added missing stdint header, bug #66907
Bob Weinand [Sat, 3 May 2014 09:41:33 +0000 (11:41 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Sat, 3 May 2014 09:40:25 +0000 (11:40 +0200)]
Merge sapi/phpdbg into PHP-5.6
krakjoe [Sat, 3 May 2014 09:37:11 +0000 (10:37 +0100)]
/me blushes, really hard
Ferenc Kovacs [Sat, 3 May 2014 00:51:46 +0000 (02:51 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
Ferenc Kovacs [Sat, 3 May 2014 00:51:02 +0000 (02:51 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
Ferenc Kovacs [Sat, 3 May 2014 00:50:37 +0000 (02:50 +0200)]
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
Adam Harvey [Fri, 2 May 2014 21:34:48 +0000 (14:34 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix mysqli build when building against libmysqlclient.
Adam Harvey [Fri, 2 May 2014 21:33:52 +0000 (14:33 -0700)]
Fix mysqli build when building against libmysqlclient.
Adam Harvey [Fri, 2 May 2014 17:26:18 +0000 (10:26 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix author name on the #63228 patch.
Adam Harvey [Fri, 2 May 2014 17:25:42 +0000 (10:25 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix author name on the #63228 patch.
Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]
Fix author name on the #63228 patch.
Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]
Fix author name on the #63228 patch.
Nikita Popov [Fri, 2 May 2014 10:52:44 +0000 (12:52 +0200)]
Merge branch 'PHP-5.6'
Nikita Popov [Fri, 2 May 2014 10:48:43 +0000 (12:48 +0200)]
Fixed bug #67169: []= after_array_splice incorrect
This fixes a regression I introduced in beta 1.
Ferenc Kovacs [Fri, 2 May 2014 07:50:40 +0000 (09:50 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
Ferenc Kovacs [Fri, 2 May 2014 07:50:25 +0000 (09:50 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
Ferenc Kovacs [Fri, 2 May 2014 07:49:10 +0000 (09:49 +0200)]
Revert "show leaks in their own group"
using valgrind would be a bit too much for travis I guess.
This reverts commit
ea60d79e23556deb0f72cf4111deefa0d9a55262 .
Ferenc Kovacs [Fri, 2 May 2014 07:33:31 +0000 (09:33 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
show leaks in their own group
Ferenc Kovacs [Fri, 2 May 2014 07:33:08 +0000 (09:33 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
show leaks in their own group
Ferenc Kovacs [Fri, 2 May 2014 07:32:42 +0000 (09:32 +0200)]
show leaks in their own group
Adam Harvey [Thu, 1 May 2014 18:23:48 +0000 (11:23 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Use the right path for the suggested PHP invocation in ext_skel.
Changed to more understandable NEWS message
one heading is enough
Adam Harvey [Thu, 1 May 2014 18:23:14 +0000 (11:23 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Use the right path for the suggested PHP invocation in ext_skel.
Adam Harvey [Thu, 1 May 2014 18:22:46 +0000 (11:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Use the right path for the suggested PHP invocation in ext_skel.
Adam Harvey [Thu, 1 May 2014 18:21:34 +0000 (11:21 -0700)]
Use the right path for the suggested PHP invocation in ext_skel.
Fixes bug #67160 (ext_skel outputs incorrect information).
Bob Weinand [Thu, 1 May 2014 15:10:00 +0000 (17:10 +0200)]
Changed to more understandable NEWS message
Ferenc Kovacs [Thu, 1 May 2014 14:38:06 +0000 (16:38 +0200)]
one heading is enough
Ferenc Kovacs [Thu, 1 May 2014 14:25:38 +0000 (16:25 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add new NEWS block for alpha3
Ferenc Kovacs [Thu, 1 May 2014 14:24:49 +0000 (16:24 +0200)]
add new NEWS block for alpha3
Ferenc Kovacs [Thu, 1 May 2014 10:50:28 +0000 (12:50 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
XFAIL the leaking multibyte tests, we should really get to the bottom of this
Ferenc Kovacs [Thu, 1 May 2014 10:49:45 +0000 (12:49 +0200)]
XFAIL the leaking multibyte tests, we should really get to the bottom of this
Bob Weinand [Thu, 1 May 2014 10:30:46 +0000 (12:30 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Thu, 1 May 2014 10:27:38 +0000 (12:27 +0200)]
Fixed numbering in UPGRADING file
Bob Weinand [Thu, 1 May 2014 09:47:28 +0000 (11:47 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Thu, 1 May 2014 09:46:35 +0000 (11:46 +0200)]
Updated NEWS for fixed phpdbg issue #85
Bob Weinand [Thu, 1 May 2014 09:38:08 +0000 (11:38 +0200)]
Added stdion/stdout/stderr constsnts and their php:// wrappers
Fixes issue #85
Bob Weinand [Thu, 1 May 2014 09:41:49 +0000 (11:41 +0200)]
Merge sapi/phpdbg
Bob Weinand [Thu, 1 May 2014 09:38:08 +0000 (11:38 +0200)]
Added stdion/stdout/stderr constsnts and their php:// wrappers
Fixes issue #85
Ferenc Kovacs [Thu, 1 May 2014 08:57:12 +0000 (10:57 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing NEWS entry to the correct release where it was added
5.5.12 was released yesterday
add missing NEWS entry to the correct release where it was added
add missing NEWS entry to the correct release where it was added
Ferenc Kovacs [Thu, 1 May 2014 08:56:39 +0000 (10:56 +0200)]
add missing NEWS entry to the correct release where it was added
Ferenc Kovacs [Thu, 1 May 2014 08:56:21 +0000 (10:56 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.12 was released yesterday
add missing NEWS entry to the correct release where it was added
add missing NEWS entry to the correct release where it was added
Ferenc Kovacs [Thu, 1 May 2014 08:54:15 +0000 (10:54 +0200)]
5.5.12 was released yesterday
Ferenc Kovacs [Thu, 1 May 2014 08:52:24 +0000 (10:52 +0200)]
add missing NEWS entry to the correct release where it was added
Ferenc Kovacs [Thu, 1 May 2014 08:52:13 +0000 (10:52 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add missing NEWS entry to the correct release where it was added
Bob Weinand [Thu, 1 May 2014 08:51:45 +0000 (10:51 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Thu, 1 May 2014 08:50:41 +0000 (10:50 +0200)]
Updated NEWS entry for phpdbg
Ferenc Kovacs [Thu, 1 May 2014 08:50:08 +0000 (10:50 +0200)]
add missing NEWS entry to the correct release where it was added
Ferenc Kovacs [Thu, 1 May 2014 08:44:31 +0000 (10:44 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add some missing NEWS entries
Ferenc Kovacs [Thu, 1 May 2014 08:43:34 +0000 (10:43 +0200)]
add some missing NEWS entries
Michael Wallner [Wed, 30 Apr 2014 11:03:12 +0000 (13:03 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test locality inconsitency
Michael Wallner [Wed, 30 Apr 2014 11:02:43 +0000 (13:02 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test locality inconsitency
Michael Wallner [Wed, 30 Apr 2014 11:01:59 +0000 (13:01 +0200)]
fix test locality inconsitency
Michael Wallner [Wed, 30 Apr 2014 07:29:53 +0000 (09:29 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
Michael Wallner [Wed, 30 Apr 2014 07:29:37 +0000 (09:29 +0200)]
BFN
Michael Wallner [Wed, 30 Apr 2014 07:28:21 +0000 (09:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
Michael Wallner [Wed, 30 Apr 2014 07:26:50 +0000 (09:26 +0200)]
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
Ferenc Kovacs [Tue, 29 Apr 2014 22:08:38 +0000 (00:08 +0200)]
Merge remote-tracking branch 'origin/PHP-5.6'
* origin/PHP-5.6:
Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
separate travis jobs for debug and non-debug builds
separate travis jobs for TS and NTS builds
put this test back to XFAIL, as it was before, since it is still leaking memory
Ferenc Kovacs [Tue, 29 Apr 2014 22:07:49 +0000 (00:07 +0200)]
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
* origin/PHP-5.5:
separate travis jobs for debug and non-debug builds
separate travis jobs for TS and NTS builds
put this test back to XFAIL, as it was before, since it is still leaking memory
Conflicts:
ext/mbstring/tests/zend_multibyte-08.phpt
Ferenc Kovacs [Tue, 29 Apr 2014 21:34:10 +0000 (23:34 +0200)]
Merge remote-tracking branch 'tyrael/more_travis' into PHP-5.5
* tyrael/more_travis:
separate travis jobs for debug and non-debug builds
separate travis jobs for TS and NTS builds
put this test back to XFAIL, as it was before, since it is still leaking memory
Bob Weinand [Tue, 29 Apr 2014 18:43:58 +0000 (20:43 +0200)]
Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
Stanislav Malyshev [Tue, 29 Apr 2014 16:17:10 +0000 (09:17 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #67060: use default mode of 660
Stanislav Malyshev [Tue, 29 Apr 2014 16:15:49 +0000 (09:15 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #67060: use default mode of 660
Stanislav Malyshev [Tue, 29 Apr 2014 16:14:40 +0000 (09:14 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67060: use default mode of 660
Stanislav Malyshev [Tue, 15 Apr 2014 17:43:24 +0000 (10:43 -0700)]
Fix bug #67060: use default mode of 660