18b97c94b2
Merge branch 'PHP-7.0'
2015-12-11 17:26:48 +08:00
b5adfee320
Fixed bug memleak in header_register_callback
2015-12-11 17:26:31 +08:00
e26b605c21
prepare 7.0.1RC1
2015-12-08 15:54:44 +01:00
4dc7354c28
Merge branch 'PHP-7.0'
2015-11-29 19:31:04 +00: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
dcfc623079
Merge branch 'PHP-7.0'
2015-11-25 08:00:50 -08: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
694570ab54
Update php_ini.c
...
trivial typo fix
2015-11-11 00:06:06 +02:00
6ff014b31c
Make sure context is set to null to prevent use after free
2015-11-09 11:58:34 +08:00
f31e6bc96a
Merge branch '70842-streams-segfault' of https://github.com/cchamplin/php-src
2015-11-09 11:57:32 +08:00
655e266440
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
fix decrement_function regarding bug #70863
Fixed bug #70863 Incorect logic to increment_function for proxy objects
no more dev ZEND_VERSION
Add support for IPV6_V6ONLY on sockets
Conflicts:
Zend/zend.h
2015-11-06 23:10:40 +01:00
855bb36fd0
Add support for IPV6_V6ONLY on sockets
2015-11-06 21:45:31 +01:00
f2ad7e73bd
Make sure context is set to null to prevent use after free
2015-11-02 21:58:04 +00:00
cb85f570c8
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:07:37 +03: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
b6cbc06d19
Fix php_stream_get_from_zval(), so that it works under PHP7
...
# We don't use zval** anymore, nor do any extension in PECL or core
# currently use this macro, but third party could. See PR#1562 on Github
2015-10-19 16:55:37 +02:00
655e16ee95
Merge branch 'PHP-7.0'
...
* PHP-7.0:
increase API versions
2015-10-12 20:26:34 +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
1518a722d2
Merge branch 'patch-1' of https://github.com/rquadling/php-src
2015-09-30 12:57:31 +08:00
1958e49c62
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:18:30 +03:00
560e4fa393
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:17:43 +03:00
01ecfe4195
Merge branch 'PHP-7.0'
2015-09-28 12:28:20 +02: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
f4f4c79cf9
Spelling
...
bugger => buffer
2015-09-25 12:16:53 +01:00
360f96e216
bump versions in master
2015-09-14 23:46:10 +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
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
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
24f0fe6b1f
Fixed bug #70198 Checking liveness does not work as expected
2015-08-11 14:40:34 +02:00
37707b2dd6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #69487 : SAPI may truncate POST data
2015-08-11 01:42:25 +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
3a66a23679
avoid unnecessary scoping
2015-07-31 19:09:37 +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
13525328ed
Cleanup shutdown, enable proper memory leak displaying
...
phpdbg should not memory leak...
2015-07-24 17:17:26 +02:00
Xinchen Hui