1
0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Commit Graph

5080 Commits

Author SHA1 Message Date
Anatol Belski
9cd2d77514 Fixed bug #76422 ftruncate fails on files > 2GB 2018-06-09 11:28:24 +02:00
Dmitry Stogov
e17fc0d73c Added parentheses 2018-06-06 15:29:59 +03:00
Peter Kokot
1e5ca6209b Fix warning unused variable ret 2018-06-02 13:30:23 +02:00
Dmitry Stogov
0b90cf85a6 Removed "dead" code (zend_hash_update() never fails) 2018-06-01 11:58:57 +03:00
Dmitry Stogov
d90c6f2443 Removed useless zval_ptr_dtor() 2018-05-29 17:58:06 +03:00
Dmitry Stogov
5eb1f92f31 Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence. 2018-05-28 16:27:12 +03:00
Dmitry Stogov
524f5245c5 Avoid useless checks, using zend_string_efree(), in cases where the string is known to be a temporary allocated zend_string. 2018-05-08 17:30:15 +03:00
Dmitry Stogov
eafa92ba9d zend_fcall_info_cache.calling_scope is not used by zend_call_function() and doesn't have to be initialized.
It's used only as a result of zend_is_callable() in forward_static_call and spl_autoload.
2018-05-03 19:27:04 +03:00
Dmitry Stogov
83f98f7340 Don't store values of PHP_SAPI and PHP_BINARY in file cache, because it may be used by different SAPI. 2018-04-28 01:20:49 +03:00
Nikita Popov
bd4b203585 Merge branch 'PHP-7.2' 2018-03-23 21:14:58 +01:00
Thomas Petazzoni
2842aa2a07 main/php_ini.c: build empty php_load_zend_extension_cb() when !HAVE_LIBDL
Commit 0782a7fc63 ("Fixed bug #74866
extension_dir = "./ext" now use current directory for base") modified
the php_load_zend_extension_cb() function to use php_load_shlib(), and
pass a handle to the newly introduced zend_load_extension_handle()
function instead of passing the extension path to
zend_load_extension().

While doing so, it introduced a call to php_load_shlib() from code
that is built even when HAVE_LIBDL is not defined. However,
php_load_shlib() is not implemented when HAVE_LIBDL is not defined,
for obvious reasons.

It turns out that zend_load_extension_handle() anyway doesn't do
anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and
ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined
(Zend/zend_portability.h).

Fixes the following build failure when building on a system that
doesn't have libdl:

main/php_ini.o: In function `php_load_zend_extension_cb':
php_ini.c:(.text+0x478): undefined reference to `php_load_shlib'
php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib'
collect2: error: ld returned 1 exit status

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-03-23 21:13:45 +01:00
Remi Collet
d660d6d31b next is 7.2.5 2018-03-13 12:49:25 +01:00
Anatol Belski
f28630eae0 Merge branch 'PHP-7.2'
* PHP-7.2:
  Guard platform dependent code
2018-03-07 12:29:56 +01:00
Anatol Belski
22857f1d89 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Guard platform dependent code
2018-03-07 12:29:22 +01:00
Anatol Belski
281e2f8207 Guard platform dependent code 2018-03-07 12:28:29 +01:00
Sara Golemon
5dd2a4185c Now working on 7.2.4-dev 2018-02-13 14:32:37 -05:00
Joe
1f0ea7fa4d bump versions 2018-02-13 20:24:34 +01:00
Gabriel Caruso
8034fdc9d9 Use int instead of integer in proto 2018-02-02 22:32:15 +01:00
Anatol Belski
ec0bcecee7 Add RtlSecureZeroMemory to explicit_bzero() compile case
just in case one would use the function directly. The use of
ZEND_SECURE_ZERO could be eliminated now, too. Or it can be
kept for BC.
2018-01-26 21:34:31 +01:00
Sara Golemon
df4edde870 Remove padding just merged since 7.3 isn't released yet.
Also bump PHP_API_VERSION since the struct size has changed.
2018-01-23 11:13:41 -05:00
Sara Golemon
76b63ed149 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix alignment of PG struct cause by ignore_user_abort big endian fix
2018-01-23 11:11:43 -05:00
Sara Golemon
0c22cda951 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix alignment of PG struct cause by ignore_user_abort big endian fix
2018-01-23 11:11:37 -05:00
Sara Golemon
3ffdf6c088 Fix alignment of PG struct cause by ignore_user_abort big endian fix 2018-01-23 11:06:34 -05:00
Sara Golemon
81425be70b Merge branch 'PHP-7.2'
* PHP-7.2:
  BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
2018-01-23 08:59:30 -05:00
Sara Golemon
871066523e Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
2018-01-23 08:58:53 -05:00
Sara Golemon
d46d53a7bc BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool 2018-01-23 08:58:19 -05:00
David Carlier
7f51257c08 NetBSD has its own unoptimizable memset version since 2013
checking presence of the function if older versions of NetBSD
2018-01-19 18:24:36 +01:00
Anatol Belski
ea56fc840e 7.0.15 next 2018-01-16 19:47:35 +01:00
Remi Collet
5a54107879 next is 7.2.3 2018-01-16 09:54:57 +01:00
Lior Kaplan
0e3dede07c Happy new year (Update copyright to 2018) 2018-01-04 01:02:17 +02:00
Gabriel Caruso
6400264856 Trailing whitespaces
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-03 14:38:00 +01:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Dmitry Stogov
d9f5ea691f zend_fcall_info_cache.initialized is removed (zend_fcall_info_cache is initialized if zend_fcall_info_cache.function_handler is set). 2017-12-27 15:15:03 +03:00
Nikita Popov
688b9136ab Fixed bug #54043 2017-12-23 13:35:08 +01:00
Nikita Popov
66c8a9d672 Remove EH_SUPPRESS mode
It is unused and does not work in any meaningful way:
Warnings are suppressed, but everything else (both notices and
fatals) are not. It would make some sense if it suppressed
warnings and lower, but right now this is a pointless mode.
2017-12-23 13:28:09 +01:00
Xinchen Hui
4dfbfe93aa Use cheaper API 2017-12-18 11:55:14 +08:00
David Carlier
e835e3c132 Improve explicit_bzero implementation
Using the weak symbol explicit_bzero_hook does not work if LTO is
enabled. Instead avoid memset optimizations using an asm memory
barrier.

Use a fallback implementation where the memory is zeroed through
volatile.
2017-12-16 23:07:48 +01:00
Markus Staab
5142a06506 Use known string "file" in stream layer 2017-12-16 13:25:05 +01:00
Dmitry Stogov
0f06df310c Turn "php_stream_wrapper"s into constants
Keep non-constant "php_stream_wrapper"s in API functions and callbacks for compatibility.
2017-12-14 22:46:22 +03:00
Dmitry Stogov
83e495e0fd Move constants into read-only data segment 2017-12-14 22:14:36 +03:00
Dmitry Stogov
9e709e2fa0 Move constants into read-only data segment 2017-12-14 18:43:44 +03:00
Dmitry Stogov
76e4c8ba73 typo 2017-12-12 19:01:10 +03:00
Dmitry Stogov
fe4c7898d8 Avoid reallocation and double copying of variable names. 2017-12-12 13:47:47 +03:00
Javier Eguiluz
c136fda18e Fixed a typo 2017-12-09 18:39:06 +01:00
Anatol Belski
98416a37f3 Put missing signature into header 2017-12-09 00:26:18 +01:00
Dmitry Stogov
6a9d2b2190 Cleanup type conversion 2017-12-07 19:24:55 +03:00
krakjoe
71a460ba7e bump versions 2017-12-05 14:18:48 +01:00
Dmitry Stogov
cc6a41fad1 Use interned strings as variable names 2017-12-01 01:37:48 +03:00