89798f57d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improve CURL tests to allow testing without separate server
2014-05-11 23:03:21 -07:00
c507c9f01b
improve CURL tests to allow testing without separate server
2014-05-11 22:43:08 -07:00
997be125eb
Fixed bug #67199 mb_regex_encoding mishmash
2014-05-12 13:33:53 +09:00
f2fdeba19d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:56:32 -07:00
af5cc61cf3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
2014-05-11 18:16:19 -07:00
291b45afb5
Fix bug #67248 (imageaffinematrixget missing check of parameters)
2014-05-11 18:14:57 -07:00
2b475eebbe
Fix bug #67247 spl_fixedarray_resize integer overflow
2014-05-11 17:54:27 -07:00
14dd6c2d54
fix news
2014-05-11 17:43:28 -07:00
cdd1c1122e
add tests stuff to README
2014-05-11 16:04:28 -07:00
5bc4eb714a
Merge branch 'PHP-5.4' into PHP-5.5
2014-05-11 15:15:27 +02:00
62b2eb666d
Updated NEWS
2014-05-11 15:13:40 +02:00
5bf6a093ad
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 )
...
Linux apparently does not like memcpy in overlapping regions...
2014-05-11 15:11:03 +02:00
9d8a00337d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:38 -03:00
b99862e7ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:25 -03:00
fb3b8de98d
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:45:17 -03:00
ece7421864
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Move checking
2014-05-10 11:55:48 -03:00
16b293de50
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Move checking
2014-05-10 11:55:45 -03:00
c575ab0c88
- Move checking
2014-05-10 11:55:42 -03:00
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
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
345f6d90d5
- Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:40 -03:00
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
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
5bd443a452
- Fixed missing NULL check
2014-05-10 11:39:08 -03:00
398ff21923
updated NEWS
2014-05-09 22:17:22 +02:00
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
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
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
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
4392339c3e
oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 01:59:39 -07:00
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
e9be93b333
make release tags not fail Travis CI
2014-05-08 01:11:29 -07:00
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
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
0cc18fdfba
Fix memory leak in TSRM
2014-05-08 01:00:34 -07:00
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
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
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
8517001b25
Fixed test (it requires ext/hash)
2014-05-07 00:52:49 +02:00
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
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
f880013c4d
Fixed tests (they might fail from time to time because of session GC)
2014-05-07 00:37:56 +02:00
78cb0c1dbc
NEWS
2014-05-06 12:39:23 +02:00
66c177c770
XFAIL-- for bug #67198
2014-05-06 12:21:43 +02:00
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
7308d47c4b
fix bug #67198 (php://input regression)
2014-05-06 12:21:43 +02:00
1a293e6bd9
rename a constant - old name to new name
2014-05-06 11:36:03 +03:00
94231ac454
test for bug #67198
2014-05-05 16:25:15 +02:00
0d5121a3c7
fixed ZEND_DEBUG usage
2014-05-05 00:50:51 +02:00
06ae920165
updated libmagic.patch
2014-05-04 21:34:17 +02:00
Stanislav Malyshev