07a8e5ce37
Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now).
2015-09-30 09:03:35 +02:00
0c10e10ee8
update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release
2015-09-30 01:28:39 +02:00
264f33a23f
add NEWS entries
2015-09-30 01:16:43 +02:00
62ff2d0bfe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add NEWS entries
2015-09-30 01:15:54 +02:00
932f707177
add NEWS entries
2015-09-30 01:15:24 +02:00
2e267bd3c7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for bug #70433
Conflicts:
ext/phar/dirstream.c
2015-09-28 21:42:08 -07:00
1ddf72180a
Better fix for bug #70433
2015-09-28 21:41:02 -07:00
51b23cd0f0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix memory leak
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
Conflicts:
ext/phar/dirstream.c
2015-09-28 20:44:28 -07:00
f98ab19dc0
fix memory leak
2015-09-28 20:43:18 -07:00
e78ac461db
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
2015-09-28 17:12:35 -07:00
f39a4ee0c9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 16:59:46 -07:00
d698f0ae51
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 15:56:51 -07:00
629e4da7cc
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 11:31:14 -07:00
59de2c037c
Fixed bug #70572 segfault in mysqlnd_connect
2015-09-25 14:06:28 +02:00
85be6fe96b
Spread the news about 70384
2015-09-25 13:54:10 +02:00
f451b023d1
update NEWS
2015-09-23 20:00:38 +02:00
257693614e
add test
2015-09-23 19:48:38 +02:00
ca89d9a797
expose openssl config path so it can be tested
2015-09-23 19:48:20 +02:00
f79cd18789
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:25:12 +02:00
8317e0fa46
add missing header
...
For PRIu32 and maybe more, that fixes build
2015-09-23 14:01:59 +02:00
c505d55158
silence mkdir to fix fails after unclean test run
2015-09-23 13:55:28 +02:00
96d1d13d87
Update timelib to 2015.02
2015-09-22 08:59:45 +01:00
e4f3fb976b
Fixed test cases due to changes in rules
2015-09-22 08:42:12 +01:00
fab5cbab1a
Bumb timelib version to 2015.01
2015-09-22 08:41:56 +01:00
dcd569aad6
Use tabs for arg info indent in openssl.c
2015-09-20 12:34:35 +01:00
11cddaf6f4
prepare for PHP-5.6.14RC1
2015-09-17 01:48:02 +02:00
37d814b84c
Add test XFAIL for bug #70470
2015-09-11 13:45:18 +08:00
059dd18c37
Added support of LDAP_OPT_TIMEOUT, fixes #69574
2015-09-09 18:02:10 +02:00
43f6099ce4
Add entry for #70284 in 5.6.13
2015-09-09 14:20:04 +03:00
a483a79c85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:34:46 +02:00
cc7140e8d9
Merge branch 'pull-request/1512' into PHP-5.5
...
* pull-request/1512:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:30:17 +02:00
71da4f1f7f
Skip test for old glibc iconv
...
bug32001.phpt has a high failure rate for the submitted reports. According to
several samples it seems the iconv implementation of glibc 2.12 (released
2010-05) is the culprit. It seems appropriate to skip the test for such old
versions.
2015-09-09 04:27:28 +02:00
c3fc65eb7c
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
...
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.
This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
2015-09-08 18:42:02 -07:00
b89f128480
updated NEWS
2015-09-09 03:12:59 +02:00
7b3616db77
Fix #70456 : mysqlnd doesn't activate TCP keep-alive when connecting to a server
...
libmysqlclient activates TCP keep-alive when connecting to a server. PHP
mysqlnd extension must do the same to maintain compatibility.
2015-09-09 01:43:29 +02:00
debfc866d2
Fix build
...
php_zip.c:1647:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
php_zip.c:1648:3: error: format not a string literal and no format arguments [-Werror=format-security]
2015-09-07 13:52:28 +02:00
d47029167d
Fix bug #60632 : openssl_seal fails with AES
2015-09-06 16:39:59 +01:00
aed225b7e4
updated NEWS
2015-09-05 14:39:24 +02:00
fd94c92171
Fix #68291 : 404 on urls with '+'
...
URI paths have to be treated according to RFC 3986 by the CLI web server, not
as application/x-www-form-urlencoded.
2015-09-05 14:34:08 +02:00
f9ece83994
updated NEWS
2015-09-05 03:14:56 +02:00
43b26c7b21
Fix #70395 : Missing ARG_INFO for openssl_seal()
...
This patch adds the missing ARG_INFO for the optional 5th parameter $method.
2015-09-05 03:08:02 +02:00
dc1a8dd7f0
updated NEWS
2015-09-05 01:27:59 +02:00
b2954c64ab
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
...
Assigning to DOMNode::textContent encodes entities, what does not match the
behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch
changes the behavior of DOMNode::textContent in this regard.
2015-09-05 01:17:50 +02:00
b59ea797f5
updated NEWS
2015-09-05 00:37:08 +02:00
c77f783777
Fix #70322 : ZipArchive::close() doesn't indicate errors
...
If an archive can't be written, ZipArchive::close() nonetheless returns TRUE.
We fix the return value to properly return success, and additionally raise a
warning on failure.
2015-09-05 00:34:10 +02:00
4b1dff6f43
Fix #70361 : HTTP stream wrapper doesn't close keep-alive connections
2015-09-04 16:29:35 +02:00
52b2a3ff25
move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:13 +02:00
3759de241f
add missing news entries
2015-09-03 01:46:38 +02:00
c65350cd4d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Merge branch 'PHP-5.6'
bump version
2015-09-02 17:55:57 +02:00
bb98ed600a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Merge branch 'PHP-5.6'
bump version
Conflicts:
configure.in
main/php_version.h
2015-09-02 17:55:20 +02:00
Andrey Hristov