]>
granicus.if.org Git - php/log
Anatol Belski [Fri, 2 Feb 2018 17:30:20 +0000 (18:30 +0100)]
Use 7za for packaging
Better compression, Unicode support and general compatibility.
Christoph M. Becker [Fri, 2 Feb 2018 16:39:23 +0000 (17:39 +0100)]
Sync gdImageCrop() with upstream
Besides that we still hope to sync the complete bundled libgd sometime,
the upstream implementation of `gdImageCrop()` is much simpler than the
current one, and thus better readable and less error prone.
Dmitry Stogov [Fri, 2 Feb 2018 14:38:07 +0000 (17:38 +0300)]
Break dependency between IS_TYPE_REFCOUNTED and ZEND_CALL_FREE_EXTRA_ARGS
Dmitry Stogov [Fri, 2 Feb 2018 14:35:23 +0000 (17:35 +0300)]
Added note about changed VM instructions
Anatol Belski [Fri, 2 Feb 2018 13:09:44 +0000 (14:09 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Switch to the new PHP SDK version on AppVeyor
Anatol Belski [Fri, 2 Feb 2018 13:09:20 +0000 (14:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Switch to the new PHP SDK version on AppVeyor
Anatol Belski [Fri, 2 Feb 2018 13:06:53 +0000 (14:06 +0100)]
Switch to the new PHP SDK version on AppVeyor
Anatol Belski [Thu, 1 Feb 2018 15:52:18 +0000 (16:52 +0100)]
Fix incompatible pointer warning
Dmitry Stogov [Thu, 1 Feb 2018 14:46:30 +0000 (17:46 +0300)]
typo
Anatol Belski [Thu, 1 Feb 2018 14:30:58 +0000 (15:30 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Ensure there are no line breaks in the error msg
Anatol Belski [Thu, 1 Feb 2018 14:30:01 +0000 (15:30 +0100)]
Ensure there are no line breaks in the error msg
Anatol Belski [Thu, 1 Feb 2018 14:26:49 +0000 (15:26 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix race conditions with Apache vhost vs. per dir config
Anatol Belski [Thu, 1 Feb 2018 14:26:12 +0000 (15:26 +0100)]
[ci skip] Update NEWS
Anatol Belski [Thu, 1 Feb 2018 14:25:55 +0000 (15:25 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Fix race conditions with Apache vhost vs. per dir config
Anatol Belski [Thu, 1 Feb 2018 14:25:15 +0000 (15:25 +0100)]
[ci skip] Update NEWS
Anatol Belski [Wed, 31 Jan 2018 19:15:30 +0000 (20:15 +0100)]
Fix race conditions with Apache vhost vs. per dir config
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
(cherry picked from commit
73eb5a78b9caa18d35624765f9b972c1ba48855d )
Dmitry Stogov [Wed, 31 Jan 2018 19:39:30 +0000 (22:39 +0300)]
Changed CATCH instruction format (extended_value moved into op2, op2 into result, result into extended_value)
Anatol Belski [Wed, 31 Jan 2018 19:26:20 +0000 (20:26 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix race conditions with Apache vhost vs. per dir config
Anatol Belski [Wed, 31 Jan 2018 19:15:30 +0000 (20:15 +0100)]
Fix race conditions with Apache vhost vs. per dir config
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
Dmitry Stogov [Wed, 31 Jan 2018 15:15:25 +0000 (18:15 +0300)]
Changed FETCH_CONSTANT instruction format (extended_value moved into op1)
Dmitry Stogov [Wed, 31 Jan 2018 15:14:43 +0000 (18:14 +0300)]
Changed FETCH_CLASS instruction format (extended_value moved into op1)
Dmitry Stogov [Wed, 31 Jan 2018 13:46:30 +0000 (16:46 +0300)]
Compress handlers table
Derick Rethans [Wed, 31 Jan 2018 11:56:11 +0000 (11:56 +0000)]
Merge branch 'PHP-7.2'
Derick Rethans [Wed, 31 Jan 2018 11:55:35 +0000 (11:55 +0000)]
Sync with timelib 2017.06
Dmitry Stogov [Wed, 31 Jan 2018 10:47:43 +0000 (13:47 +0300)]
Avoid redundand mask extraction
Dmitry Stogov [Wed, 31 Jan 2018 10:34:34 +0000 (13:34 +0300)]
Avoid redundand mask extraction
Dmitry Stogov [Wed, 31 Jan 2018 09:38:02 +0000 (12:38 +0300)]
Fixed string comparison (it may fail in case of not null-terminated strings)
Dmitry Stogov [Wed, 31 Jan 2018 08:18:41 +0000 (11:18 +0300)]
Make IS_UNUSED to be zero.
Jakub Zelenka [Tue, 30 Jan 2018 20:09:24 +0000 (20:09 +0000)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Tue, 30 Jan 2018 20:08:19 +0000 (20:08 +0000)]
Use correct certs for SNI server tests with separate key and cert
Jakub Zelenka [Tue, 30 Jan 2018 20:02:34 +0000 (20:02 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Tue, 30 Jan 2018 19:58:40 +0000 (19:58 +0000)]
Use correct certs for SNI server tests
Dmitry Stogov [Tue, 30 Jan 2018 19:06:05 +0000 (22:06 +0300)]
Change FETCH/ISSET instruction modifiers:
- Get rid of ZEND_ISEMPTY and ZEND_ISSET_ISEMPTY_MASK. Use just single ZEND_ISSET bit to make distinct between isset() and empty()
- Use ZEND_FETCH_GLOBAL, ZEND_FETCH_LOCAL and ZEND_FETCH_GLOBAL_LOCK as bitmask
- Removed unused ZEND_FETCH_STANDARD
- Extended ZEND_FETCH_ARG_MASK
Anatol Belski [Mon, 29 Jan 2018 17:24:27 +0000 (18:24 +0100)]
Implement configuration option for explicit native intrinsics
It mimics -march=native, AVX and more to go, if needed.
Thomas Punt [Mon, 29 Jan 2018 11:17:23 +0000 (11:17 +0000)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Use the correct freeing function
Thomas Punt [Mon, 29 Jan 2018 11:13:22 +0000 (11:13 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use the correct freeing function
Thomas Punt [Mon, 29 Jan 2018 11:13:10 +0000 (11:13 +0000)]
Use the correct freeing function
Gabriel Caruso [Sun, 28 Jan 2018 12:45:37 +0000 (10:45 -0200)]
Remove explicit intval() param count check
Rely on ZPP instead.
Nikita Popov [Sun, 28 Jan 2018 21:04:24 +0000 (22:04 +0100)]
Don't loop over indexes in Phar::extractTo()
Instead use a more idiomatic foreach loop. The behavior is not
strictly the same, but I see no reason why this specific case
should enforce continuously indexed integer keys.
Also handle references in the array while at it.
Gabriel Caruso [Sun, 28 Jan 2018 19:48:59 +0000 (17:48 -0200)]
Fix misspelling vlaues to values
Nikita Popov [Sun, 28 Jan 2018 20:53:38 +0000 (21:53 +0100)]
Merge branch 'PHP-7.2'
Bishop Bettini [Sat, 6 Jan 2018 07:21:30 +0000 (02:21 -0500)]
Fixed bug #54289
If a directory is passed to Phar::extractTo(), loop over all
entries and extract all files with the given prefix.
Anatol Belski [Sat, 27 Jan 2018 16:25:40 +0000 (17:25 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS.
Anatol Belski [Sat, 27 Jan 2018 16:24:29 +0000 (17:24 +0100)]
[ci skip] Update NEWS.
Anatol Belski [Sat, 27 Jan 2018 15:45:27 +0000 (16:45 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
fixed Big_endian issue on s390x for stream test cases
Sam Ding [Tue, 23 Jan 2018 21:46:55 +0000 (16:46 -0500)]
fixed Big_endian issue on s390x for stream test cases
Christoph M. Becker [Sat, 27 Jan 2018 12:14:20 +0000 (13:14 +0100)]
Merge branch 'PHP-7.2' and add NEWS entry
Christoph M. Becker [Sat, 27 Jan 2018 12:12:09 +0000 (13:12 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
Christoph M. Becker [Sat, 27 Jan 2018 12:11:30 +0000 (13:11 +0100)]
Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
This reverts commit
4bd7658e1b44b72ff76913036c1b41f74318b065 .
To avoid the BC break we apply the fix to master only.
Christoph M. Becker [Sat, 27 Jan 2018 11:46:10 +0000 (12:46 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature
Christoph M. Becker [Sat, 27 Jan 2018 11:40:20 +0000 (12:40 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature
Christoph M. Becker [Sat, 27 Jan 2018 11:33:36 +0000 (12:33 +0100)]
Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature
Nikita Popov [Fri, 26 Jan 2018 21:28:54 +0000 (22:28 +0100)]
Merge branch 'PHP-7.2'
Nikita Popov [Fri, 26 Jan 2018 21:28:48 +0000 (22:28 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Philip Prindeville [Thu, 25 Jan 2018 01:47:19 +0000 (18:47 -0700)]
Be consistent in clearing out in php_iconv_string()
Nat Zimmermann [Wed, 24 Jan 2018 21:29:04 +0000 (21:29 +0000)]
Update `mb_preferred_mime_name` tests
Nat Zimmermann [Wed, 24 Jan 2018 21:01:20 +0000 (21:01 +0000)]
Add unknown encoding warning test for mb_encoding_aliases
Gabriel Caruso [Thu, 25 Jan 2018 06:02:42 +0000 (04:02 -0200)]
Simplify returns in generate-phpt
Nikita Popov [Fri, 26 Jan 2018 21:13:11 +0000 (22:13 +0100)]
Drop the ext/intl/doc directory
Drop outdated documentation stubs. Better intl documentation is
available in the manual...
Anatol Belski [Fri, 26 Jan 2018 20:32:09 +0000 (21:32 +0100)]
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.
Dmitry Stogov [Fri, 26 Jan 2018 12:25:03 +0000 (15:25 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Restore initial values on graceful server restart.
Dmitry Stogov [Fri, 26 Jan 2018 12:22:36 +0000 (15:22 +0300)]
Restore initial values on graceful server restart.
Anatol Belski [Thu, 25 Jan 2018 17:55:54 +0000 (18:55 +0100)]
Show the tidyp name, if it was used
Anatol Belski [Thu, 25 Jan 2018 17:54:37 +0000 (18:54 +0100)]
Add missing define after
e7da9685
David Carlier [Mon, 15 Jan 2018 22:07:10 +0000 (22:07 +0000)]
Tidy extension update to be able to either use tidy or tidyp at configure time
Anatol Belski [Thu, 25 Jan 2018 15:18:34 +0000 (16:18 +0100)]
Revoke the gcc only restriction
clang at least 5.0 supports GNU style attributes and intrinsic macros.
In general, compilers claiming this functionality should know, what
they do.
Nat Zimmermann [Mon, 15 Jan 2018 23:06:55 +0000 (23:06 +0000)]
Add tests for `json_decode` with depth below 0
Nikita Popov [Wed, 24 Jan 2018 20:22:50 +0000 (21:22 +0100)]
Merge branch 'PHP-7.2'
Michael Orlitzky [Fri, 19 Jan 2018 23:53:22 +0000 (18:53 -0500)]
ext/session: catch incompatible configure flags earlier.
The session extension has a --with-mm flag that tells it to build
the mm backend ("mm" is the name of the library). However, that
backend is not thread-safe, and mod_mm.c will refuse to compile if
the --enable-maintainer-zts flag was also passed to the configure
script.
Rather than crash halfway through the build, this commit adds a check
to the session extension's config.m4 file. If both --with-mm and
--enable-maintainer-zts are "on," then the configure script will
die and explain that they can't be used together.
PHP-bug: 14269
Anatol Belski [Wed, 24 Jan 2018 17:33:32 +0000 (18:33 +0100)]
Reimplement ASCII conversion using aligned routine
Anatol Belski [Wed, 24 Jan 2018 17:21:24 +0000 (18:21 +0100)]
Macrify the common operation
Derick Rethans [Wed, 24 Jan 2018 13:57:08 +0000 (13:57 +0000)]
Updated to version 2018.3 (2018c)
Derick Rethans [Wed, 24 Jan 2018 13:57:08 +0000 (13:57 +0000)]
Empty merge
Derick Rethans [Wed, 24 Jan 2018 13:57:07 +0000 (13:57 +0000)]
Updated to version 2018.3 (2018c)
Derick Rethans [Wed, 24 Jan 2018 13:57:07 +0000 (13:57 +0000)]
Empty merge
Derick Rethans [Wed, 24 Jan 2018 13:57:06 +0000 (13:57 +0000)]
Updated to version 2018.3 (2018c)
Anatol Belski [Wed, 24 Jan 2018 09:14:28 +0000 (10:14 +0100)]
Move useful macro into zend_portability.h
Anatol Belski [Wed, 24 Jan 2018 08:33:32 +0000 (09:33 +0100)]
Implement intrinsic function resolving per MINIT
Sara Golemon [Tue, 23 Jan 2018 16:12:49 +0000 (11:12 -0500)]
Remove padding just merged since 7.3 isn't released yet.
Also bump PHP_API_VERSION since the struct size has changed.
Sara Golemon [Tue, 23 Jan 2018 16:11:43 +0000 (11:11 -0500)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix alignment of PG struct cause by ignore_user_abort big endian fix
Sara Golemon [Tue, 23 Jan 2018 16:11:37 +0000 (11:11 -0500)]
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
Sara Golemon [Tue, 23 Jan 2018 16:06:34 +0000 (11:06 -0500)]
Fix alignment of PG struct cause by ignore_user_abort big endian fix
Sara Golemon [Tue, 23 Jan 2018 14:24:54 +0000 (09:24 -0500)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
Sara Golemon [Tue, 23 Jan 2018 14:24:47 +0000 (09:24 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
Sara Golemon [Tue, 23 Jan 2018 14:24:40 +0000 (09:24 -0500)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
Sara Golemon [Tue, 23 Jan 2018 14:10:36 +0000 (09:10 -0500)]
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
Sara Golemon [Tue, 23 Jan 2018 13:59:30 +0000 (08:59 -0500)]
Merge branch 'PHP-7.2'
* PHP-7.2:
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
Sara Golemon [Tue, 23 Jan 2018 13:58:53 +0000 (08:58 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
Sara Golemon [Tue, 23 Jan 2018 13:46:38 +0000 (08:46 -0500)]
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
Dmitry Stogov [Tue, 23 Jan 2018 09:56:22 +0000 (12:56 +0300)]
Access extra data stored in zval through macros
Christoph M. Becker [Mon, 22 Jan 2018 22:39:58 +0000 (23:39 +0100)]
Update to SQLite 3.22.0
Anatol Belski [Mon, 22 Jan 2018 18:15:53 +0000 (19:15 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Mon, 22 Jan 2018 18:15:30 +0000 (19:15 +0100)]
[ci skip] Update NEWS
Anatol Belski [Mon, 22 Jan 2018 18:15:02 +0000 (19:15 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Mon, 22 Jan 2018 18:14:24 +0000 (19:14 +0100)]
[ci skip] Update NEWS
Anatol Belski [Mon, 22 Jan 2018 16:05:03 +0000 (17:05 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #73725 Unable to retrieve value of varchar(max) type
Anatol Belski [Mon, 22 Jan 2018 16:03:48 +0000 (17:03 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #73725 Unable to retrieve value of varchar(max) type
Anatol Belski [Mon, 22 Jan 2018 16:02:54 +0000 (17:02 +0100)]
Fixed bug #73725 Unable to retrieve value of varchar(max) type
Dmitry Stogov [Mon, 22 Jan 2018 13:14:56 +0000 (16:14 +0300)]
Removed commented unoptimized code
Dmitry Stogov [Mon, 22 Jan 2018 13:10:33 +0000 (16:10 +0300)]
Use OBJ_FLAGS() macro to access object flags (even if they are currently stored together with GC_FLAGS)