Nikita Popov
1b29e0cacd
Switch zend_print_zval_r to use smart_str
...
Instead of directly writing to stdout. This allows doing a print_r
into a string, without using output buffering.
The motivation for this is bug #67467 : print_r() in return mode
will still dump the string to stdout (causing a potential information
leak) if a fatal error occurs.
2016-06-13 18:04:22 +02:00
Jani Ollikainen
0a04f61448
Added backwards compability with php_log_err by using macro
2016-06-02 13:25:29 +02:00
Jani Ollikainen
3edf7d960c
Logging to syslog with dynamic error levels (related to #49467 )
2016-06-02 13:25:29 +02:00
Xinchen Hui
02571c2a7b
Merge branch 'PHP-7.0'
2016-05-31 07:24:22 -07:00
Xinchen Hui
f2a814df33
Fixed bug #72300 (ignore_user_abort(false) has no effect)
2016-05-31 07:24:02 -07:00
Nikita Popov
5595dd5ffa
Revert code to use DUP instead of COPY
...
In a1c405e0c5
next to the actual fix
I have also switched some (effective) ZVAL_DUPs to ZVAL_COPYs. I'm
reverting this part as those were probably there for a reason
(presumably issues with non-atomic refcounting on ZTS).
2016-04-29 22:02:31 +02:00
Nikita Popov
a1c405e0c5
Fix usages of zend_update_constant_ex
...
If an in-place update in an external zval is performed, it needs
to incref'd beforehand, not afterwards.
2016-04-29 14:06:39 +02:00
Dmitry Stogov
6499162ff0
- get rid of EG(scope). zend_get_executed_scope() should be used instead.
...
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
2016-04-28 04:13:34 +03:00
Nikita Popov
d3ed75b9eb
Remove HAVE_CRYPT checks
...
We always provide a crypt implementation. HAVE_CRYPT is only
relevant as to whether the crypt() C function exists.
2016-03-25 21:09:47 +01:00
Xinchen Hui
0e5fa32883
Merge branch 'PHP-7.0'
2016-03-25 12:35:20 +08:00
Xinchen Hui
1929fc9b16
Fixed bug #71891 (header_register_callback() and register_shutdown_function())
...
Actually, this fixed the memleak not the behavior(it is expected
behavior that "shutdown" is not outputed)
2016-03-25 12:34:22 +08:00
Rouven Weßling
a61029b155
Replace usage of php_int32 and php_uint32 with int32_t and uint32_t
2016-02-04 11:57:41 +01:00
Stanislav Malyshev
ea35de6e31
Merge branch 'PHP-7.0'
...
* PHP-7.0: (35 commits)
fix tests
update NEWS
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71475 : openssl_seal() uninitialized memory usage
Fixed bug #71488 : Stack overflow when decompressing tar archives
fix tests
fix wrong gc sequence
revert the API string as well
update NEWS
Revert "Fix #70720 "
sync NEWS
reset ext/session to the state of 7.0.2
update NEWS
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
...
2016-02-01 20:46:06 -08:00
Stanislav Malyshev
c631f1ee2b
Merge branch 'PHP-7.0.3' into PHP-7.0
...
* PHP-7.0.3: (35 commits)
fix tests
update NEWS
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71475 : openssl_seal() uninitialized memory usage
Fixed bug #71488 : Stack overflow when decompressing tar archives
fix tests
fix wrong gc sequence
revert the API string as well
update NEWS
Revert "Fix #70720 "
sync NEWS
reset ext/session to the state of 7.0.2
update NEWS
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
...
Conflicts:
configure.in
ext/session/tests/bug69111.phpt
main/php_version.h
2016-02-01 20:45:49 -08:00
Xinchen Hui
506d5fe4df
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71442 (forward_static_call crash)
2016-01-25 12:13:35 +08:00
Xinchen Hui
e7f2c5bd6a
Fixed bug #71442 (forward_static_call crash)
2016-01-25 12:13:22 +08:00
Anatol Belski
22a5ccab72
Follow up on bug #71270
...
Using the max allowed command line length for an underlying OS.
2016-01-12 14:41:44 +01:00
Lior Kaplan
3d5438bf7b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update header to PHP Version 7
Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016)
2016-01-01 20:04:31 +02:00
Lior Kaplan
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
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
9b148d31d3
Fixed bug #71100 (long2ip() doesn't accept integers in strict mode)
2015-12-14 14:55:44 +08:00
Xinchen Hui
7e7c2c062f
Merge branch 'PHP-7.0'
2015-11-24 13:46:04 +08:00
Xinchen Hui
e637ead6ed
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-24 13:45:32 +08:00
Xinchen Hui
e6b46dc2ff
Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters)
2015-11-24 13:45:16 +08:00
Xinchen Hui
cd6dda1679
Merge branch 'PHP-7.0'
2015-11-11 12:33:13 +08:00
Xinchen Hui
c3260b66c9
Revert "Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)"
...
This reverts commit d6c527830e
.
2015-11-11 12:06:38 +08:00
Xinchen Hui
607e17e269
Merge branch 'PHP-7.0'
2015-11-11 11:35:09 +08:00
Xinchen Hui
d6c527830e
Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Maybe we should introduce a new zend_hash_safe_apply which always reload
the ht->arData to make sure won't segfault the ht is grew?
2015-11-11 11:34:11 +08:00
Ferenc Kovacs
54670c8f05
initialize *str
2015-10-12 21:36:21 +02:00
Ferenc Kovacs
d221821cee
calling getenv() without arguments should return the environment variables as an array
2015-10-12 21:27:07 +02:00
Dmitry Stogov
6571038093
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Correct intdiv() argument names and description
2015-10-09 00:42:26 +03:00
Andrea Faulds
fa23bebe94
Correct intdiv() argument names and description
2015-10-08 15:45:22 +01:00
Ferenc Kovacs
1e66f1b9ad
Merge branch 'pr-1204'
...
* pr-1204:
no need for default value
allow passing null as the third param
Implemented FR #55716 - Add an option to pass a custom stream context
2015-10-08 10:23:24 +02:00
Andrey Hristov
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
Dmitry Stogov
ad4fa8f758
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-24 22:39:59 +03:00
Xinchen Hui
fd5e0dc3c6
Fixed bug #70342 (changing configuration with ignore_user_abort(true) isn't working)
2015-08-24 21:09:16 +08:00
Tjerk Meesters
0bd7d7a369
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS for #70157
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 16:49:30 +08:00
Tjerk Meesters
0d7159d26d
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 15:10:34 +08:00
Remi Collet
e811770a68
Fix #70112 RFE Allow dirname to go up various times
2015-07-27 15:23:04 +02:00
Rasmus Lerdorf
73773c2175
unserialize() takes a 2nd optional arg and it can't be a bool
2015-07-15 09:59:31 -07:00
Rasmus Lerdorf
f2249bf95a
php_uname has an optional arg
2015-06-30 09:55:00 -07:00
Dmitry Stogov
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
Rasmus Lerdorf
01ceb0f7fa
2nd arg of sprintf is optional
2015-06-28 18:08:22 -07:00
Rasmus Lerdorf
7ceb47477d
3rd arg to stream_set_timeout is optional
...
ignore_user_abort() should take a bool not a string
2015-06-25 10:31:37 -07:00
Rasmus Lerdorf
56b0d6f3a0
Wrong arginfo on assert
...
(not adding types, just fixing a missing arg)
2015-06-23 22:41:41 -04:00
Anatol Belski
360d8fd712
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix handling VAR vs VAR= in putenv
2015-05-21 08:22:30 +02:00
Anatol Belski
ad4d022bdf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix handling VAR vs VAR= in putenv
2015-05-21 08:21:53 +02:00
Anatol Belski
75286ece1a
fix handling VAR vs VAR= in putenv
...
using _putenv_s eliminates behavior diff in TS/NTS
2015-05-21 08:19:54 +02:00
Dmitry Stogov
f69b30eaae
Partial revert of 6a819bba40
.
2015-05-13 09:43:05 +03:00
Stanislav Malyshev
5a1bef8eef
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
Zend/zend_alloc.c
Zend/zend_operators.c
ext/ftp/ftp.c
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/dir.c
ext/standard/file.c
ext/standard/pack.c
ext/standard/string.c
main/rfc1867.c
2015-05-12 15:00:24 -07:00