0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
9e4ab7c53f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:01:41 +00:00
8a7e2f8dd2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:01:06 +00:00
e9195018dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:00:29 +00:00
3c3ff43432
fix #66375 bad logic in sapi header callback routine
2014-01-01 12:58:18 +00:00
4797f7ad16
Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
2013-12-30 14:28:43 +01:00
729f85fad7
add 'never'
2013-12-30 14:28:43 +01:00
7762de4022
fix type
2013-12-30 14:28:43 +01:00
4153c23efa
s/BOOLEAN/ENTRY/
2013-12-30 14:28:42 +01:00
3641507fc1
re-introduce always_populate_raw_post_data
2013-12-30 14:28:42 +01:00
8e5048f9fb
5.4.25 next
2013-12-24 22:22:04 -08:00
b11b3d201f
Fixed ZTS build. Needed to bump API version number.
2013-12-18 16:44:20 +01:00
aed4b086ac
Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook
2013-12-18 09:32:26 +01:00
c83598119b
Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it
...
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
2013-12-18 09:19:24 +01:00
ed5a8d510f
Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs
2013-12-18 09:06:39 +01:00
bd58146ad6
Kill another TSRMLS_FETCH() in the zend extension loading code
2013-12-18 07:59:47 +01:00
d14670ccdb
Eliminate another TSRMLS_FETCH() in i_zend_is_true()
...
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
1433dec2d0
Kill another TSRMLS_FETCH() in zend_indent()
2013-12-12 22:09:38 +01:00
58b754ca4a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:36 +01:00
39a2dcdeac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:21 +01:00
da62fd5ed8
Fixed bug #65486 mysqli_poll() is broken on Win x64
...
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.
Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
2013-12-12 10:17:01 +01:00
01a13bb8c1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
Use 'user@example.com ' rather than 'user@company.com ' in tests
2013-12-06 10:34:11 +01:00
9ea2489f5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
2013-12-06 10:33:47 +01:00
a48d82d238
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
2013-12-06 10:33:10 +01:00
b5f5bff965
Fixed bug #61645 (fopen and O_NONBLOCK)
...
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
2013-12-06 10:29:24 +01:00
de3b9bc77c
Renumber the comments in php_request_shutdown() to be in order.
...
What, me OCD?
2013-12-04 14:29:45 -08:00
406d5a5ecc
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
UPGRADING
2013-12-04 16:20:03 +02:00
df755deb45
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix php_module_startup() when loading more than one additional module
2013-12-03 18:21:12 -08:00
00a7b1ff7f
Fix php_module_startup() when loading more than one additional module
...
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).
Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.
Fixes 63159
Thanks to @a-j-k
2013-12-03 18:20:19 -08:00
e9c6a1cfd2
5.5.8-dev now
2013-11-27 09:34:40 +01:00
63f3ff7b5f
5.4.24-dev now
2013-11-27 00:13:45 -08:00
9e3551ba1f
Eliminated the TSRMLS_FETCH() in zend_set_memory_limit()
2013-11-18 01:36:17 +01:00
1984919ddc
5.5.7 now
2013-11-12 18:20:09 +01:00
d17b684b91
bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
2013-11-06 14:03:24 +01:00
117955daf6
bump API versions
2013-11-06 14:03:24 +01:00
929bf11e91
bump API versions
2013-11-06 11:17:58 +01:00
39e7dcc3bb
back to do_alloca()
2013-10-31 21:42:55 +01:00
fc707a27ff
back to do_alloca(), reverted the wrong replacement
2013-10-30 20:13:14 +01:00
4ded6ee971
5.4.23-dev
2013-10-29 18:11:02 -07:00
e17de5e9fd
Merge branch 'bug50333' of github.com:weltling/php-src into bug50333
2013-10-29 17:15:40 +01:00
70c3a722e2
Increment version number, since this will be 5.5.6.
2013-10-23 12:36:27 -07:00
cf6ab0e915
applied and fixed the original patch
...
initial work on the patch import done
2013-10-17 10:40:43 +02:00
e30b2aae5a
initial move on renaming files and fixing includes
2013-10-17 09:43:52 +02:00
2ddefbd2b3
Added support for TLSv1.1 and TLSv1.2
2013-10-08 14:09:17 -04:00
b2f8f35a88
5.4.22-dev now
2013-10-01 22:25:56 -07:00
11d60447f9
add note about request_body and php://input
2013-09-19 15:41:04 +02:00
86dfe7be49
better way to fix PRIu64 availability on windows
2013-09-18 15:14:36 +02:00
33c4b61c7f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:44 +02:00
a34b141e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:11 +02:00
Xinchen Hui