Bob Weinand
b11b3d201f
Fixed ZTS build. Needed to bump API version number.
2013-12-18 16:44:20 +01:00
Kalle Sommer Nielsen
aed4b086ac
Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook
2013-12-18 09:32:26 +01:00
Kalle Sommer Nielsen
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
Kalle Sommer Nielsen
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
Kalle Sommer Nielsen
bd58146ad6
Kill another TSRMLS_FETCH() in the zend extension loading code
2013-12-18 07:59:47 +01:00
Kalle Sommer Nielsen
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
Kalle Sommer Nielsen
1433dec2d0
Kill another TSRMLS_FETCH() in zend_indent()
2013-12-12 22:09:38 +01:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
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
Michael Wallner
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
Michael Wallner
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
Michael Wallner
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
Michael Wallner
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
Adam Harvey
de3b9bc77c
Renumber the comments in php_request_shutdown() to be in order.
...
What, me OCD?
2013-12-04 14:29:45 -08:00
Andrey Hristov
406d5a5ecc
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
UPGRADING
2013-12-04 16:20:03 +02:00
Sara Golemon
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
Sara Golemon
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
Julien Pauli
e9c6a1cfd2
5.5.8-dev now
2013-11-27 09:34:40 +01:00
Stanislav Malyshev
63f3ff7b5f
5.4.24-dev now
2013-11-27 00:13:45 -08:00
Kalle Sommer Nielsen
9e3551ba1f
Eliminated the TSRMLS_FETCH() in zend_set_memory_limit()
2013-11-18 01:36:17 +01:00
Julien Pauli
1984919ddc
5.5.7 now
2013-11-12 18:20:09 +01:00
Ferenc Kovacs
d17b684b91
bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
2013-11-06 14:03:24 +01:00
Ferenc Kovacs
117955daf6
bump API versions
2013-11-06 14:03:24 +01:00
Ferenc Kovacs
929bf11e91
bump API versions
2013-11-06 11:17:58 +01:00
Anatol Belski
39e7dcc3bb
back to do_alloca()
2013-10-31 21:42:55 +01:00
Anatol Belski
fc707a27ff
back to do_alloca(), reverted the wrong replacement
2013-10-30 20:13:14 +01:00
Stanislav Malyshev
4ded6ee971
5.4.23-dev
2013-10-29 18:11:02 -07:00
Anatol Belski
e17de5e9fd
Merge branch 'bug50333' of github.com:weltling/php-src into bug50333
2013-10-29 17:15:40 +01:00
Adam Harvey
70c3a722e2
Increment version number, since this will be 5.5.6.
2013-10-23 12:36:27 -07:00
Anatol Belski
cf6ab0e915
applied and fixed the original patch
...
initial work on the patch import done
2013-10-17 10:40:43 +02:00
Anatol Belski
e30b2aae5a
initial move on renaming files and fixing includes
2013-10-17 09:43:52 +02:00
Daniel Lowrey
2ddefbd2b3
Added support for TLSv1.1 and TLSv1.2
2013-10-08 14:09:17 -04:00
Stanislav Malyshev
b2f8f35a88
5.4.22-dev now
2013-10-01 22:25:56 -07:00
Michael Wallner
11d60447f9
add note about request_body and php://input
2013-09-19 15:41:04 +02:00
Anatol Belski
86dfe7be49
better way to fix PRIu64 availability on windows
2013-09-18 15:14:36 +02:00
Michael Wallner
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
Michael Wallner
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
Michael Wallner
9bfd55cda3
fix a very rare case of use of uninitialized value combined with a
...
memleak
2013-09-18 11:10:55 +02:00
Anatol Belski
4a85b5e190
fix build - PRIu64 vs %I64u
2013-09-17 16:02:08 +02:00
Michael Wallner
423c70fb4d
Merge branch 'slim-postdata-merge'
...
* slim-postdata-merge:
remove unused code
tests
make reading php://input JIT if enable_post_data_reading=0
revert stream cast
fix ZTS build
slim post data
Conflicts:
ext/soap/soap.c
ext/standard/php_fopen_wrapper.c
main/SAPI.c
2013-09-17 13:52:25 +02:00
Michael Wallner
1c15d70cbd
Merge branch 'slim-postdata'
...
* slim-postdata:
slim post data
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
Michael Wallner
449d4c0b1c
make reading php://input JIT if enable_post_data_reading=0
2013-09-10 13:13:33 +02:00
Michael Wallner
e3e4d1b144
revert stream cast
2013-09-10 13:13:09 +02:00
Julien Pauli
0e10f26e27
5.5.5 now
2013-09-04 11:22:23 +02:00
Stanislav Malyshev
7beef74a82
5.4.21 now
2013-09-03 13:38:15 -07:00
Michael Wallner
bb1f9d3826
slim post data
2013-08-27 13:43:22 +02:00
Michael Wallner
2438490add
slim post data
2013-08-27 13:31:35 +02:00
Stanislav Malyshev
53d9643431
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
bump version
Update NEWS
Conflicts:
configure.in
main/php_version.h
2013-08-19 23:23:21 -07:00
Stanislav Malyshev
d487f5e9ac
bump version
2013-08-19 23:19:51 -07:00