Christoph M. Becker
1b344f55f4
Revert "Fix #70029 : nodeValue of DOMElement list content of children nodes"
...
This reverts commit 25a52d98d7
.
2015-09-06 15:36:43 +02:00
Christoph M. Becker
892a745ef1
updated NEWS
2015-09-05 14:51:25 +02:00
Christoph M. Becker
cc9da62bdb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #68291 : 404 on urls with '+'
Resolved conflicts:
sapi/cli/php_cli_server.c
2015-09-05 14:43:19 +02:00
Christoph M. Becker
aed225b7e4
updated NEWS
2015-09-05 14:39:24 +02:00
Christoph M. Becker
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
Christoph M. Becker
403974f4dc
updated NEWS
2015-09-05 03:22:45 +02:00
Christoph M. Becker
28e82cc714
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70395 : Missing ARG_INFO for openssl_seal()
2015-09-05 03:19:43 +02:00
Christoph M. Becker
f9ece83994
updated NEWS
2015-09-05 03:14:56 +02:00
Christoph M. Becker
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
Christoph M. Becker
8355dfc41a
updated NEWS and UPGRADING
2015-09-05 02:03:23 +02:00
Christoph M. Becker
25a52d98d7
Fix #70029 : nodeValue of DOMElement list content of children nodes
...
According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is
supposed to yield null, but currently the DOM extension yield the result of
calling xmlNodeGetContent(), what is the concatenation of the values of the
children of the element. This patch fixes the non standard behavior.
2015-09-05 01:52:41 +02:00
Christoph M. Becker
3be54e12d5
updated NEWS
2015-09-05 01:35:16 +02:00
Christoph M. Becker
c9a8733ce2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
Resolved conflicts:
ext/dom/node.c
2015-09-05 01:32:08 +02:00
Christoph M. Becker
dc1a8dd7f0
updated NEWS
2015-09-05 01:27:59 +02:00
Christoph M. Becker
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
Christoph M. Becker
320e891f5b
updated NEWS
2015-09-05 00:47:09 +02:00
Christoph M. Becker
0836d6484c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70322 : ZipArchive::close() doesn't indicate errors
2015-09-05 00:43:41 +02:00
Christoph M. Becker
b59ea797f5
updated NEWS
2015-09-05 00:37:08 +02:00
Christoph M. Becker
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
Jakub Zelenka
539db00538
Simplify JSON constants registration
2015-09-04 20:00:29 +01:00
Jakub Zelenka
6e5574807f
Add my name to authors for previous refactoring
...
Related to jsond changes
2015-09-04 19:56:59 +01:00
Jakub Zelenka
7fe2646be3
Move json_decode options macros bellow encode options
2015-09-04 19:37:12 +01:00
Ryan McCullagh
45fdff1c85
json: fix formating of PHP_JSON* option bitshifts
2015-09-04 19:29:54 +01:00
Kalle Sommer Nielsen
fbfceaaa5d
Merge branch 'pull-request/1497'
2015-09-04 17:59:06 +02:00
Kalle Sommer Nielsen
4481be5d26
Fix build on Windows
2015-09-04 17:49:48 +02:00
Bob Weinand
3d05785054
Merge remote-tracking branch 'origin/PHP-5.6'
2015-09-04 16:35:15 +02:00
Niklas Keller
4b1dff6f43
Fix #70361 : HTTP stream wrapper doesn't close keep-alive connections
2015-09-04 16:29:35 +02:00
Márcio Almada
c08b3922dd
adds missing tokens to list of semi-reserved words and regenerates test suite
2015-09-04 15:02:50 +02:00
Joe Watkins
26e619b192
these need to be exported for extensions that use json
2015-09-03 19:28:34 +01:00
Anatol Belski
0f74baed9c
prepare NEWS for next
2015-09-03 19:04:39 +02:00
Lior Kaplan
3bb88aee53
Align NEWS entries format
2015-09-03 19:49:07 +03:00
Lior Kaplan
dbbc0e4ced
Align NEWS entries format
2015-09-03 19:46:41 +03:00
Anatol Belski
fcece2a7bb
sync NEWS
2015-09-03 18:25:14 +02:00
Lior Kaplan
9131cf4924
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
2015-09-03 18:46:07 +03:00
Lior Kaplan
23b88d38e8
Align NEWS entries format
2015-09-03 17:53:53 +03:00
Lior Kaplan
abf0ede0ac
Add CVE for #70140 (PHP 7.0.0 Beta 3)
2015-09-03 17:51:07 +03:00
Xinchen Hui
49ee37d870
Seems master is not affected
2015-09-02 23:15:57 -07:00
Xinchen Hui
d5b78cec64
We should keep one refcount to resource
2015-09-02 22:14:48 -07:00
Xinchen Hui
6815c08e29
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
2015-09-02 22:07:29 -07:00
Xinchen Hui
6290344d96
Fixed test
2015-09-02 21:59:36 -07:00
Levi Morrison
432dc527ad
Partially fix bug #67167 - Wrong return value...
...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE
The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
2015-09-02 18:23:26 -06:00
Ferenc Kovacs
4388eba510
Merge branch 'PHP-5.6'
...
* PHP-5.6:
move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:29 +02:00
Ferenc Kovacs
52b2a3ff25
move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:13 +02:00
Ferenc Kovacs
ece397ef0f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing news entries
2015-09-03 01:47:17 +02:00
Ferenc Kovacs
3759de241f
add missing news entries
2015-09-03 01:46:38 +02:00
Levi Morrison
730496b899
Skip if ext/filter isn't loaded
2015-09-02 10:12:08 -06:00
Julien Pauli
1f0045d44a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Merge branch 'PHP-5.6'
bump version
2015-09-02 17:56:49 +02:00
Julien Pauli
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
Julien Pauli
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
Matteo Beccati
a12cef979d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added missing skipif for phar+zlib test
2015-09-02 17:53:36 +02:00