Nikita Popov
76b2b4a190
Merge branch 'PHP-7.1' into PHP-7.2
2017-09-24 08:55:12 +02:00
Nikita Popov
628c257f71
Merge branch 'PHP-7.0' into PHP-7.1
2017-09-24 08:54:36 +02:00
Nikita Popov
73d6456d7d
Fixed bug #75252
2017-09-24 08:53:27 +02:00
Anatol Belski
95870dcc77
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix thread safety
2017-09-21 10:33:13 +02:00
Anatol Belski
96323d1bd7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix thread safety
2017-09-21 10:32:47 +02:00
Anatol Belski
da2f581833
Fix thread safety
2017-09-21 10:32:09 +02:00
Andrea Faulds
7418f6814f
Merge branch 'PHP-7.1' into PHP-7.2
2017-09-21 00:04:56 +01:00
Andrea Faulds
b71023e297
Merge branch 'PHP-7.0' into PHP-7.1
2017-09-21 00:04:08 +01:00
Andrea Faulds
418f97443a
Fix bug #75236
2017-09-21 00:02:52 +01:00
Dmitry Stogov
5ef10d08ec
Use private names for new libpcre symbols.
2017-09-18 20:00:45 +03:00
Joe Watkins
7f01872a24
bump versions
2017-09-12 15:34:30 +01:00
Anatol Belski
5cf215536b
Move dev to 7.0.25
2017-09-12 09:02:01 +02:00
David Carlier
24c0a17d78
Sync strlcat() implementation
...
Sync with last version made few days after.
2017-08-25 22:12:23 +02:00
Joe Watkins
5b02d10584
bump versions
2017-08-16 16:41:15 +01:00
Anatol Belski
3af6201224
move dev to 7.0.24
2017-08-15 09:33:30 +02:00
Anatol Belski
0a2a136111
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #75063
2017-08-14 00:51:47 +02:00
Anatol Belski
3069ad8dd1
Fixed bug #75063
2017-08-14 00:44:19 +02:00
Andrea Faulds
f877b86604
Merge branch 'PHP-7.1' into PHP-7.2
2017-08-12 01:38:46 +01:00
Andrea Faulds
e88ab74886
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-12 01:37:47 +01:00
Andrea Faulds
b59718bdc4
Fix bug #74725 (html_errors=1 breaks unhandled exceptions)
2017-08-12 01:37:20 +01:00
Anatol Belski
7ec8b8d49f
remove casts and ensure no out of bounds access
2017-07-21 22:26:37 +02:00
Sara Golemon
bb02f99e71
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Do not allow using traits/interfaces/abstract classes as stream wrappers
Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
2017-07-19 14:01:18 -04:00
Sara Golemon
a9e8239f45
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Do not allow using traits/interfaces/abstract classes as stream wrappers
2017-07-19 14:01:00 -04:00
Sara Golemon
c9fd093127
Do not allow using traits/interfaces/abstract classes as stream wrappers
...
Fixes https://bugs.php.net/bug.php?id=74951
2017-07-19 14:00:00 -04:00
Dmitry Stogov
6fcc7134f1
Keep resource of enclosing stream, because it may be referenced from other place(s).
...
This fixes valgrind warnings on Zend/tests/type_declarations/scalar_basic.phpt
2017-07-19 17:16:56 +03:00
Dmitry Stogov
95a1f77b5e
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Reset globals on startup or restart
2017-07-19 15:36:48 +03:00
Dmitry Stogov
4252f14299
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Reset globals on startup or restart
2017-07-19 15:36:24 +03:00
Dmitry Stogov
e5beb4e828
Reset globals on startup or restart
2017-07-19 15:35:10 +03:00
Joe Watkins
f4323248ec
bump versions
2017-07-18 17:21:19 +01:00
Sara Golemon
05ff0c5180
Bump all API numbers in prep for 7.2 fork
2017-07-18 10:45:02 -04:00
Anatol Belski
649027b963
move to 7.0.23 for dev
2017-07-18 10:25:40 +02:00
Sara Golemon
3de82a0349
Provide zend_string wrappers for php_base64_(en|de)code
...
Also pull existing php_base64_decode() proxy out to an inline.
Bump PHP_API_VERSION for ABI change.
2017-07-16 17:01:20 -04:00
Francois Laupretre
0782a7fc63
Fixed bug #74866 extension_dir = "./ext" now use current directory for base
2017-07-13 14:27:19 +02:00
Anatol Belski
2283b6ff53
eliminate casts
2017-07-10 15:48:54 +02:00
Anatol Belski
72b0a3a892
remove some casts
2017-07-09 15:47:01 +02:00
Anatol Belski
84079f4a1e
cleanup casts
2017-07-09 15:31:05 +02:00
Anatol Belski
e403acc74b
remove useless cast
2017-07-09 15:15:17 +02:00
Anatol Belski
aaf09f7bdf
eliminate casts
2017-07-09 15:11:02 +02:00
Anatol Belski
384f0f8a4c
sync vim mode lines in main
2017-07-09 15:07:23 +02:00
Anatol Belski
9ad0d0ca3c
replace the stack var by a macro
2017-07-06 20:47:04 +02:00
Anatol Belski
e08c0ed8ce
Bug #74815 crash with a combination of INI entries at startup
...
TS related VCWD routines depend on CWD. Thus, a premature CWD
deactivation renders the VCWD layer unusable. Same issue seems to
persist in versions < 7.2, just that the code path is actually unused so
the issue didn't show up. Still might make sense to backport this into
lower branches.
2017-06-27 16:30:10 +02:00
Dmitry Stogov
caaeb4849a
Removed EG(valid_symbol_table). Used EG(active) instead.
2017-06-26 13:35:07 +03:00
Tom Van Looy
04fb3f28ff
Remove superfluous semicolons
2017-06-26 00:23:25 +02:00
Nikita Popov
205807f60e
Move va_copy compatibility code into zend_portability.h
...
Previously this was defined in zend.c and php.h and also handled
in another way in soap.c.
2017-06-25 17:00:26 +02:00
Dmitry Stogov
d55b43d9cb
Merge branch 'fast_shutdown'
...
* fast_shutdown:
Reseet EG(active) a bit early.
Reuse "nIndex"
shutdown_executor() refactoring (reuse opcache fast request shutdown code)
2017-06-23 14:59:29 +03:00
Sara Golemon
d09edf7b34
Minor refactor of load extension by name impl
...
Minimize the #ifdef surface area
Localize orig_libpath to retry scope
Send errors to php_error() rathern than stderr
2017-06-22 13:13:45 -04:00
Francois Laupretre
fe5c8f2b80
Allow loading PHP and Zend extensions by name
...
Allow extension name as INI 'extension=' and dl() argument
No BC break, as file name is still accepted.
When using the '-z' command line option (CLI/CGI), an absolute file name must still be provided (nothing changed here)
Change comments in example INI files
2017-06-22 12:58:15 -04:00
Dmitry Stogov
f25ecdacf8
shutdown_executor() refactoring (reuse opcache fast request shutdown code)
2017-06-22 01:45:28 +03:00
Dmitry Stogov
7af5741333
Avoid useless duplication
2017-06-21 12:57:24 +03:00
Dmitry Stogov
687123ebf2
Use request heap.
2017-06-21 11:25:05 +03:00