Felipe Pena
c575ab0c88
- Move checking
2014-05-10 11:55:42 -03:00
Felipe Pena
c54b9f7b72
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:54 -03:00
Felipe Pena
8bea8cf9cd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:45 -03:00
Felipe Pena
345f6d90d5
- Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:40 -03:00
Felipe Pena
edbd6c7cc0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed missing NULL check
2014-05-10 11:39:47 -03:00
Felipe Pena
2379ec474e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed missing NULL check
2014-05-10 11:39:28 -03:00
Felipe Pena
5bd443a452
- Fixed missing NULL check
2014-05-10 11:39:08 -03:00
Anatol Belski
398ff21923
updated NEWS
2014-05-09 22:17:22 +02:00
Anatol Belski
c925c7a5b6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
2014-05-09 22:16:42 +02:00
Anatol Belski
c62f32c3cc
Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
...
upstream patch applied
2014-05-09 22:15:54 +02:00
Stanislav Malyshev
a3f09eb323
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:04:11 -07:00
Stanislav Malyshev
cf2b9955d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:00:23 -07:00
Stanislav Malyshev
4392339c3e
oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 01:59:39 -07:00
Stanislav Malyshev
aa1a25e303
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
make release tags not fail Travis CI
2014-05-08 01:11:44 -07:00
Stanislav Malyshev
e9be93b333
make release tags not fail Travis CI
2014-05-08 01:11:29 -07:00
Stanislav Malyshev
0c709cc2dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix memory leak in TSRM
2014-05-08 01:01:15 -07:00
Stanislav Malyshev
a444900c8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix memory leak in TSRM
2014-05-08 01:00:51 -07:00
Stanislav Malyshev
0cc18fdfba
Fix memory leak in TSRM
2014-05-08 01:00:34 -07:00
Daniel Lowrey
27f5957e9f
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
2014-05-07 08:05:29 -06:00
Ferenc Kovacs
f63ca453e0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test (it requires ext/hash)
2014-05-07 01:00:01 +02:00
Ferenc Kovacs
8e2d396b52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test (it requires ext/hash)
2014-05-07 00:55:05 +02:00
Dmitry Stogov
8517001b25
Fixed test (it requires ext/hash)
2014-05-07 00:52:49 +02:00
Ferenc Kovacs
d2f283884f
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.
2014-05-07 00:38:57 +02:00
Ferenc Kovacs
579898e338
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.
2014-05-07 00:38:32 +02:00
Dmitry Stogov
f880013c4d
Fixed tests (they might fail from time to time because of session GC)
2014-05-07 00:37:56 +02:00
Michael Wallner
78cb0c1dbc
NEWS
2014-05-06 12:39:23 +02:00
Michael Wallner
66c177c770
XFAIL-- for bug #67198
2014-05-06 12:21:43 +02:00
Michael Wallner
5bdfa4d1c6
remove useless indirection
...
the stream was initialized within the ops
in a prior version of the slim_post_data patch
2014-05-06 12:21:43 +02:00
Michael Wallner
7308d47c4b
fix bug #67198 (php://input regression)
2014-05-06 12:21:43 +02:00
Andrey Hristov
1a293e6bd9
rename a constant - old name to new name
2014-05-06 11:36:03 +03:00
Ferenc Kovacs
94231ac454
test for bug #67198
2014-05-05 16:25:15 +02:00
Anatol Belski
0d5121a3c7
fixed ZEND_DEBUG usage
2014-05-05 00:50:51 +02:00
Anatol Belski
06ae920165
updated libmagic.patch
2014-05-04 21:34:17 +02:00
Anatol Belski
031cafd4e2
added missing stdint header, bug #66907
2014-05-04 21:26:53 +02:00
Bob Weinand
003ba74d99
Merge sapi/phpdbg into PHP-5.6
2014-05-03 11:40:25 +02:00
krakjoe
c8d8e851fa
/me blushes, really hard
2014-05-03 10:37:11 +01:00
Ferenc Kovacs
c29a72d17f
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
2014-05-03 02:51:02 +02:00
Ferenc Kovacs
58f4bf441a
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
2014-05-03 02:50:37 +02:00
Adam Harvey
06a03bbfa6
Fix mysqli build when building against libmysqlclient.
2014-05-02 14:33:52 -07:00
Adam Harvey
fbb0c4b800
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix author name on the #63228 patch.
2014-05-02 10:25:42 -07:00
Adam Harvey
d8ff8f6f20
Fix author name on the #63228 patch.
2014-05-02 10:24:09 -07:00
Adam Harvey
f7cb87f333
Fix author name on the #63228 patch.
2014-05-02 10:23:09 -07:00
Nikita Popov
69b5ee61d0
Fixed bug #67169 : []= after_array_splice incorrect
...
This fixes a regression I introduced in beta 1.
2014-05-02 12:49:51 +02:00
Ferenc Kovacs
cc2e89d4e1
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.
2014-05-02 09:50:25 +02:00
Ferenc Kovacs
192b35382a
Revert "show leaks in their own group"
...
using valgrind would be a bit too much for travis I guess.
This reverts commit ea60d79e23
.
2014-05-02 09:49:10 +02:00
Ferenc Kovacs
a7437db776
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
show leaks in their own group
2014-05-02 09:33:08 +02:00
Ferenc Kovacs
ea60d79e23
show leaks in their own group
2014-05-02 09:32:42 +02:00
Adam Harvey
d5712d6ba4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:23:14 -07:00
Adam Harvey
eb46096608
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:22:46 -07:00
Adam Harvey
941c39bd06
Use the right path for the suggested PHP invocation in ext_skel.
...
Fixes bug #67160 (ext_skel outputs incorrect information).
2014-05-01 11:22:20 -07:00