1dc395c8c4
improve fix for bug #71273
2016-01-05 20:03:05 +01:00
9a07245b72
Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash
2016-01-05 18:54:46 +01:00
736b91c650
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
2016-01-04 18:13:38 +01:00
53fb2f1e5c
Happy new year (Update copyright to 2016)
2016-01-03 01:44:37 +02:00
2eb1f38d24
Happy new year (Update copyright to 2016)
2016-01-01 20:03:16 +02:00
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
da028e0757
This should be better
2015-12-30 05:10:05 -08:00
b2ecac9250
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Added support for HTTP 451
Conflicts:
sapi/cgi/cgi_main.c
sapi/cli/php_cli_server.c
sapi/fpm/fpm/fpm_main.c
2015-12-23 11:36:36 +01:00
84530360a0
7.0.3 next
2015-12-22 10:48:32 +01:00
9374977d21
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/opcache/Optimizer/pass1_5.c
2015-12-17 14:30:00 +08:00
ef9ddd0d82
Remove sqlite extension leftover references (was removed in PHP 5.4)
2015-12-16 09:40:02 +02:00
b5adfee320
Fixed bug memleak in header_register_callback
2015-12-11 17:26:31 +08:00
7d5dbaed76
5.6.18 will be next
2015-12-10 01:30:27 +01:00
e26b605c21
prepare 7.0.1RC1
2015-12-08 15:54:44 +01:00
e6e77d9e27
Fix typo in php_stream_from_res_no_verify
...
This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.
2015-11-29 19:28:25 +00:00
4a7e83f54a
Fixed bug #70970 (Segfault when combining error handler with output buffering)
...
of course we can try to refactor the current flow to make this error can
be catched safly.
but as 7.0.0 is releasing, I don't think a refactor is safe now. and
actually I don't see any gain to make this catchable.
so let's keep this be consistent with 5.6 and safe for now
2015-11-25 08:00:20 -08:00
b22636c838
propare for 5.6.16RC1
2015-11-11 09:20:16 +01:00
6ff014b31c
Make sure context is set to null to prevent use after free
2015-11-09 11:58:34 +08:00
855bb36fd0
Add support for IPV6_V6ONLY on sockets
2015-11-06 21:45:31 +01:00
c67fc6bb09
Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:06:55 +03:00
ac4601eadd
7.0.1 is next
2015-10-27 20:08:54 +01:00
22cbf68344
prepare for 5.6.15RC1
2015-10-15 00:22:12 +02:00
dcbbf7c38d
increase API versions
2015-10-12 20:17:22 +02:00
64990642cf
Spelling
...
bugger => buffer
2015-09-30 12:59:16 +08:00
560e4fa393
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:17:43 +03:00
be6546fac9
Add support for parameters to tick functions, on C level. This is only
...
for extensions that want to use register tick functions. Userland tick
functions are unaffected.
2015-09-28 11:21:17 +02:00
11cddaf6f4
prepare for PHP-5.6.14RC1
2015-09-17 01:48:02 +02:00
a8368ddc38
Fixed bug #70431 (Memory leak in php_ini.c)
2015-09-10 19:56:13 +08:00
9d82a7dc98
add overflow check
2015-09-02 17:05:45 +02:00
95ac779956
remove unnecessary macros
2015-09-02 17:05:43 +02:00
8da0aeaa13
Removed signal protection (set to NULL before free() to avoid dangling pointers)
2015-08-28 15:32:50 +03:00
859712a89c
remove redundant ;
2015-08-27 13:05:41 +08:00
aa24209855
Enable format checking for strpprintf
2015-08-27 11:42:50 +08:00
96ea4a0ac6
Mark error functions as "cold"
2015-08-24 18:07:59 +03:00
a3eed5fbfe
Move __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defs earlier
...
These defines should apply to windows as well,
so move them out of the non-windows specific section
and always define them for C++ compilations.
2015-08-20 14:40:08 -07:00
29a8981c81
Enable definitions of stdint.h limits/constants used by Zend/zend_long.h
...
Define __STDC_LIMITS_MACROS and __STDC_CONSTANT_MACROS
prior to including stdint.h for the first time so that it
defines the INT64_MAX / INT64_C / etc... macros we use elsewhere
when building for C++ (C already gets these).
2015-08-20 11:34:44 -07:00
c7c9858ba1
5.6.14 next
2015-08-20 09:56:47 +02:00
aae9004ebd
Removed dead code
2015-08-17 17:18:25 +02:00
5f54027d04
Renamed struct member
...
<resolv.h> has a #define for _res which makes compilation
fail if included before php_output.h
2015-08-17 16:25:03 +02:00
797e30f4fc
Fixed bug #70198 Checking liveness does not work as expected
2015-08-11 17:36:10 +02:00
48c71cd94b
Fix #69487 : SAPI may truncate POST data
...
If SG(request_info).request_body can't be completely written (e.g. due to a
full drive), only parts of the POST data will be available. This patch changes
this, so that SG(request_info).request_body will be reset in this case, and a
warning will be thrown.
2015-08-11 01:32:13 +02:00
9fdb8c2ccd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #70002 TS issues with temporary dir handling
2015-07-28 17:42:37 +02:00
ce5c4500cd
Fixed bug #70002 TS issues with temporary dir handling
2015-07-28 17:41:38 +02:00
20e765b841
Fixed bug #69900 Too long timeout on pipes
2015-07-28 10:28:45 +02:00
3eee495570
5.6.13 now
2015-07-22 09:27:49 +02:00
9834cd9339
Revert "Revert "suggest parentheses around ‘&&’ within ‘||’""
...
This reverts commit ec1e8929c4
2015-08-11 22:34:39 +08:00
ec1e8929c4
Revert "suggest parentheses around ‘&&’ within ‘||’"
...
This reverts commit 4f2c0e0451
2015-08-11 22:14:37 +08:00
4f2c0e0451
suggest parentheses around ‘&&’ within ‘||’
2015-08-11 21:43:38 +08:00
7eb6bd1311
add EAGAIN checks
...
EAGAIN and EWOULDBLOCK should be checked together and don't necessary,
have same value. So checking both is better for portability.
2015-08-11 15:17:25 +02:00
Anatol Belski