1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Commit Graph

106451 Commits

Author SHA1 Message Date
Gabriel Caruso 53dbc69a8d Use %d when expecting line number in tests 2018-02-02 22:35:13 +01:00
Michael Smith 58c778ba60 Fix spelling and grammar mistakes in php.ini files
The spelling of input_encoding is incorrect in both the php.ini-production
and php.ini-development, as of March, 2014. This fixes the spelling.

Cleaning up spelling and grammar includes wrapping lines to 80 characters,
adding articles such as 'the', and fixing spellings such as pathes to
paths.
2018-02-02 22:33:24 +01:00
Gabriel Caruso 8034fdc9d9 Use int instead of integer in proto 2018-02-02 22:32:15 +01:00
Anatol Belski ff02775331 Use 7za for packaging
Better compression, Unicode support and general compatibility.
2018-02-02 18:31:22 +01:00
Christoph M. Becker b309f645f9 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.
2018-02-02 17:39:23 +01:00
Dmitry Stogov 9a6100f9dd Break dependency between IS_TYPE_REFCOUNTED and ZEND_CALL_FREE_EXTRA_ARGS 2018-02-02 17:38:07 +03:00
Dmitry Stogov 1208acfe5f Added note about changed VM instructions 2018-02-02 17:35:23 +03:00
Anatol Belski e9ae821abd Merge branch 'PHP-7.2'
* PHP-7.2:
  Switch to the new PHP SDK version on AppVeyor
2018-02-02 14:09:44 +01:00
Anatol Belski b7575758a9 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Switch to the new PHP SDK version on AppVeyor
2018-02-02 14:09:20 +01:00
Anatol Belski b1ee215c69 Switch to the new PHP SDK version on AppVeyor 2018-02-02 14:06:53 +01:00
Anatol Belski 674c1ea7dc Fix incompatible pointer warning 2018-02-01 16:52:18 +01:00
Dmitry Stogov 8c977c3430 typo 2018-02-01 17:46:30 +03:00
Anatol Belski 459667ee32 Merge branch 'PHP-7.2'
* PHP-7.2:
  Ensure there are no line breaks in the error msg
2018-02-01 15:30:58 +01:00
Anatol Belski 138ea7c3fe Ensure there are no line breaks in the error msg 2018-02-01 15:30:01 +01:00
Anatol Belski 1f2a5ca417 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
2018-02-01 15:26:49 +01:00
Anatol Belski bc584c408c [ci skip] Update NEWS 2018-02-01 15:26:12 +01:00
Anatol Belski 88aeb104a2 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
2018-02-01 15:25:55 +01:00
Anatol Belski 2ae46f8eb6 [ci skip] Update NEWS 2018-02-01 15:25:15 +01:00
Anatol Belski bced074124 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 73eb5a78b9)
2018-02-01 15:24:31 +01:00
Dmitry Stogov ba298725d1 Changed CATCH instruction format (extended_value moved into op2, op2 into result, result into extended_value) 2018-01-31 22:39:30 +03:00
Anatol Belski 3c6e1c2b81 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix race conditions with Apache vhost vs. per dir config
2018-01-31 20:26:20 +01:00
Anatol Belski 73eb5a78b9 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.
2018-01-31 20:15:30 +01:00
Dmitry Stogov 9c7fb529ce Changed FETCH_CONSTANT instruction format (extended_value moved into op1) 2018-01-31 18:15:25 +03:00
Dmitry Stogov f67f455ef7 Changed FETCH_CLASS instruction format (extended_value moved into op1) 2018-01-31 18:14:43 +03:00
Dmitry Stogov 9701b644fa Compress handlers table 2018-01-31 16:46:30 +03:00
Derick Rethans 3152d44b36 Merge branch 'PHP-7.2' 2018-01-31 11:56:11 +00:00
Derick Rethans 5feb53964f Sync with timelib 2017.06 2018-01-31 11:55:35 +00:00
Dmitry Stogov 59ede4c82b Avoid redundand mask extraction 2018-01-31 13:47:43 +03:00
Dmitry Stogov 1d7eab12e6 Avoid redundand mask extraction 2018-01-31 13:34:34 +03:00
Dmitry Stogov e43ac26356 Fixed string comparison (it may fail in case of not null-terminated strings) 2018-01-31 12:38:02 +03:00
Dmitry Stogov 17a3b48454 Make IS_UNUSED to be zero. 2018-01-31 11:18:41 +03:00
Jakub Zelenka 67e8445334 Merge branch 'PHP-7.2' 2018-01-30 20:09:24 +00:00
Jakub Zelenka 3348d40a7b Use correct certs for SNI server tests with separate key and cert 2018-01-30 20:08:19 +00:00
Jakub Zelenka aef59537e6 Merge branch 'PHP-7.1' into PHP-7.2 2018-01-30 20:02:34 +00:00
Jakub Zelenka fe2ac52d50 Use correct certs for SNI server tests 2018-01-30 19:58:40 +00:00
Dmitry Stogov 7141631cc8 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
2018-01-30 22:06:05 +03:00
Anatol Belski acbd348969 Implement configuration option for explicit native intrinsics
It mimics -march=native, AVX and more to go, if needed.
2018-01-29 18:26:03 +01:00
Thomas Punt e51aadcc4e Merge branch 'PHP-7.2'
* PHP-7.2:
  Use the correct freeing function
2018-01-29 11:17:23 +00:00
Thomas Punt 0f393a6102 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Use the correct freeing function
2018-01-29 11:13:22 +00:00
Thomas Punt fb128f6512 Use the correct freeing function 2018-01-29 11:13:10 +00:00
Gabriel Caruso 4f961e0c4a Remove explicit intval() param count check
Rely on ZPP instead.
2018-01-28 22:07:10 +01:00
Nikita Popov 4a7dacb5ee 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.
2018-01-28 22:05:44 +01:00
Gabriel Caruso faf785af9d Fix misspelling vlaues to values 2018-01-28 21:55:21 +01:00
Nikita Popov d79a0bf748 Merge branch 'PHP-7.2' 2018-01-28 21:53:38 +01:00
Bishop Bettini fa586cee3e Fixed bug #54289
If a directory is passed to Phar::extractTo(), loop over all
entries and extract all files with the given prefix.
2018-01-28 21:51:25 +01:00
Anatol Belski 3917b51358 Merge branch 'PHP-7.2'
* PHP-7.2:
  [ci skip] Update NEWS.
2018-01-27 17:25:40 +01:00
Anatol Belski a99df321f1 [ci skip] Update NEWS. 2018-01-27 17:24:29 +01:00
Anatol Belski 4752f8a8ed Merge branch 'PHP-7.2'
* PHP-7.2:
  fixed Big_endian issue on s390x for stream test cases
2018-01-27 16:45:27 +01:00
Sam Ding a8c6b36d62 fixed Big_endian issue on s390x for stream test cases 2018-01-27 16:39:03 +01:00
Christoph M. Becker 5d7b2ce961 Merge branch 'PHP-7.2' and add NEWS entry 2018-01-27 13:16:06 +01:00