782b84c6d5
updated default per proposal
...
TODO: adjust php.ini defaults
2017-01-06 05:25:08 +00:00
66b698c3cf
Increase realpath_cache_size default value
2017-01-06 05:25:04 +00:00
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
935b5cb11e
Flush stderr on win32 in cli_log_message
...
This allows us to unfork a bunch of tests for Windows.
2017-01-01 21:09:02 +01:00
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
4b5cce269b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:14:22 +01:00
632fc51d98
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:13:07 +01:00
fffbca55e8
backport 9a07245b72 from 7.0
2016-01-11 20:37:46 +01:00
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
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
8da0aeaa13
Removed signal protection (set to NULL before free() to avoid dangling pointers)
2015-08-28 15:32:50 +03:00
96ea4a0ac6
Mark error functions as "cold"
2015-08-24 18:07:59 +03:00
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
c444c4172f
further cleanups with S_IF* macros generalized declarations
2015-05-25 18:03:28 +02:00
f69b30eaae
Partial revert of 6a819bba40.
2015-05-13 09:43:05 +03:00
6a819bba40
Fix for #66048
2015-05-12 16:15:01 +02:00
2ddb560c2e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix for #66048
2015-05-12 16:12:51 +02:00
c117548ea9
Fix for #66048
2015-05-12 16:12:29 +02:00
a5a7db8a6a
Fix build
2015-04-04 22:11:37 +02:00
118a2fa8d9
This part here was moved to the EG constructor by Anatol in f51a9c71dd
2015-04-04 22:04:32 +02:00
c48611772d
Remove the special disabled functions on Windows, since we don't even support those versions of Windows anymore hence it makes no sense to even check for it
2015-03-29 09:41:47 +02:00
a75e8d1fe6
Drop this VC8+ check, since our bare minimum of required VC version is higher anyway, meaning that CRT warnings are always supported.
2015-03-29 06:45:40 +02:00
8153286efe
Drop zend_indent() as it was never used, complete or working
2015-03-27 20:04:46 +01:00
56eed39e04
Fixed phar test segfault after merged engine exception
2015-03-10 15:04:01 +08:00
b0055678bf
Fix CLI test and drop some now unnecessary code
2015-03-09 14:09:34 +01:00
1c94ff0595
Implement engine exceptions
...
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7
Pending changes regarding naming of BaseException and whether it
should be an interface.
2015-03-09 14:01:32 +01:00
2fa8d67a5c
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.
2015-03-04 02:05:28 +03:00
bb2e62ecda
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Improve fix for bug 67741
Conflicts:
main/main.c
2015-03-03 16:29:41 +08:00
6cb3b941df
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Improve fix for bug 67741
Added type checks
Added type checks
2015-03-03 16:27:35 +08:00
860fc3947f
Improve fix for bug 67741
...
Thanks to laruence.
2015-03-03 16:25:43 +08:00
c6e415aeb2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Conflicts:
main/main.c
2015-03-03 11:44:52 +08:00
4e2c87edb3
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:43:23 +08:00
34f09b6240
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:25:30 +08:00
8f5676f73e
Merge branch 'PHP-5.6'
2015-02-27 12:03:04 +08:00
578903578c
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 12:03:00 +08:00
4eb830b212
Reorder
2015-02-27 12:02:42 +08:00
b0e95e1e35
Merge branch 'PHP-5.6'
2015-02-27 12:01:40 +08:00
d377cb6207
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 12:01:05 +08:00
ebfc49aa91
Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build)
2015-02-27 12:00:52 +08:00
a9ba407ce1
Fix bug #68166
...
We can't always efree here
php_escape_html_entities can return an interned_empty_string
2015-02-22 08:25:56 -08:00
e12b72d3f7
Fix bug #68166
...
We can't always efree here
php_escape_html_entities can return an interned_empty_string
2015-02-22 08:14:41 -08:00
4629f8978e
Cleanup globals initialization
...
No needs explicit inititlize zero for globals in no-zts build.
executor_globals should be initialized in zend side.
2015-02-21 11:35:16 +08:00
e10e151e9b
Merged zend_array and HashTable into the single data structure.
...
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
2015-02-13 22:20:39 +03:00
e5d8a14239
Revert "Cleanup globals initialization"
...
This reverts commit 309e90638d
2015-02-13 18:25:44 +08:00
309e90638d
Cleanup globals initialization
2015-02-13 10:58:35 +08:00
cc13d8696f
Fix another invalid free of CG(interned_empty_string)
...
Fixes #68214
2015-02-07 19:17:31 +01:00
13fc7f20a4
Invalid free of CG(interned_empty_string)
...
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
2015-02-06 16:53:01 +01:00
ef1505821b
Merge branch 'PHP-5.6'
2015-02-03 23:24:53 +08:00
Markus Staab