5cd8ff9885
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.24-dev now
Conflicts:
configure.in
main/php_version.h
2013-11-27 00:14:42 -08:00
63f3ff7b5f
5.4.24-dev now
2013-11-27 00:13:45 -08:00
0fc90b100d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-26 20:10:30 +02:00
de65817136
Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:57:32 +04:00
2381b817aa
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed a wrong test
2013-11-26 21:44:54 +04:00
9a6b72a05a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26 19:15:43 +02:00
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
0aadab0e2e
add test
2013-11-26 19:15:12 +02:00
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
d79dd9cc1c
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:00:00 +04:00
ff20a9019d
Fixed a wrong test
2013-11-26 17:43:31 +01:00
27524b52b5
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 19:55:49 +04:00
d85ac7fb3f
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 17:47:02 +04:00
f28ac55b6d
Added test
2013-11-26 12:13:42 +04:00
a8c7e50f4d
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
2013-11-26 11:34:41 +04:00
29ee38bf0d
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-11-25 21:33:04 +02:00
1b0e6067d5
bring the news
2013-11-25 21:31:51 +02:00
b7b6c35eea
Fixed compatibility with old PHP versions
2013-11-25 14:09:57 +04:00
27dc82d0ec
Fixed bug #65915 (Inconsistent results with require return value)
2013-11-25 14:07:24 +04:00
ad5a63e8bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2013-11-21 21:29:02 +01:00
345032946c
fixed test
2013-11-21 21:24:47 +01:00
763f4aef8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:29:37 +02:00
ce09822269
And here is the real fix for #66124
2013-11-21 21:29:21 +02:00
c2b2afacc0
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:15:22 +02:00
4a1c9be857
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:14:42 +02:00
18b2b2a0bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
permanently deactivate that place, not on runtime only
2013-11-20 10:11:39 +01:00
b902a25cc3
permanently deactivate that place, not on runtime only
...
besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this
2013-11-20 10:09:11 +01:00
b8b92bd790
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:23:54 +09:00
0d558afc05
Fix WS in serialization_error_002.phpt
2013-11-20 07:17:53 +09:00
050dd59c63
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:14:53 +09:00
72a8489a12
Fixed tests that fail with non-default serialize_precision configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:34 +09:00
101c780500
Fixed tests that fail with non-default serialize_precision configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:23 +09:00
87cabc04ac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
avoid doing a stream_select on a closed stream
2013-11-19 12:42:25 +01:00
25c08a839a
avoid doing a stream_select on a closed stream
2013-11-19 12:41:58 +01:00
e3528f086a
Updated NEWS
2013-11-18 21:23:45 +00:00
9937e2fda5
Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5
...
* CLIGetAllHeadersBackport:
Removed UPGRADING note
Rewrote test using tcp instead of http:// stream
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:19:07 +00:00
5e9268f469
Update NEWS
2013-11-17 17:06:27 +08:00
de79c51555
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-17 17:05:04 +08:00
823e330c75
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
2013-11-17 17:04:37 +08:00
d0cd112702
This is CLI web server change. Added some common MIME types to the
...
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that. Ref http://news.php.net/php.internals/69990
A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php
2013-11-15 12:36:25 -08:00
cd6eda5e5f
NEWS
2013-11-15 09:52:48 +01:00
b8d88bf2c5
Fix Bug #65714 PHP cli forces the tty to cooked mode
...
Only drop the using_history() call with libedit as I don't know
if it is required with readline.
This also allow to run a php script in background without
it being aborted on first output.
2013-11-15 09:49:42 +01:00
d7441f6695
Move the JSON bugfix into the 5.5.6 changelog.
2013-11-14 10:52:07 -08:00
7d2609b0f5
Removed UPGRADING note
...
Conflicts:
UPGRADING
2013-11-13 17:05:02 +00:00
018b9445da
Fix failed test with recent glibc
...
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See http://repo.or.cz/w/glibc.git/commitdiff/ddc7e412ab252e7360a4357664beb3b5d9c4f42b
So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string
Removing %Z from tested format gives the same behavior with all version.
2013-11-13 13:19:10 +01:00
a3f5b9f62d
Rewrote test using tcp instead of http:// stream
2013-11-12 20:27:38 +00:00
aee271ec0d
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
...
- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code
Conflicts:
NEWS
UPGRADING
2013-11-12 20:27:34 +00:00
1984919ddc
5.5.7 now
2013-11-12 18:20:09 +01:00
304bff90f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:11:28 -05:00
Stanislav Malyshev