]>
granicus.if.org Git - php/log
Xinchen Hui [Wed, 1 Nov 2017 10:42:12 +0000 (18:42 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed string interning during constants substitution
Dmitry Stogov [Wed, 1 Nov 2017 07:56:37 +0000 (10:56 +0300)]
Fixed string interning during constants substitution
Xinchen Hui [Wed, 1 Nov 2017 07:41:41 +0000 (15:41 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Revert "Fixed string interning during constants substitution"
Fixed string interning during constants substitution
Xinchen Hui [Wed, 1 Nov 2017 07:30:41 +0000 (15:30 +0800)]
Use zend_get_executed_filename_ex
Dmitry Stogov [Wed, 1 Nov 2017 07:39:47 +0000 (10:39 +0300)]
Revert "Fixed string interning during constants substitution"
This reverts commit
e0924c52fc7c69b483b5416c609ce7f008584845 .
Dmitry Stogov [Wed, 1 Nov 2017 07:34:39 +0000 (10:34 +0300)]
Fixed string interning during constants substitution
Xinchen Hui [Wed, 1 Nov 2017 02:25:10 +0000 (10:25 +0800)]
RC manipulation cleanup
Dmitry Stogov [Tue, 31 Oct 2017 23:40:39 +0000 (02:40 +0300)]
Use interned strings for hash algorithm names (not copyied into SHM)
Dmitry Stogov [Tue, 31 Oct 2017 23:39:09 +0000 (02:39 +0300)]
Use interned strings for stream transports
Dmitry Stogov [Tue, 31 Oct 2017 23:38:26 +0000 (02:38 +0300)]
Use Zend MM heap
Dmitry Stogov [Tue, 31 Oct 2017 22:31:47 +0000 (01:31 +0300)]
Avoid reference counting (the value may be a persistent string)
Dmitry Stogov [Tue, 31 Oct 2017 22:10:21 +0000 (01:10 +0300)]
Fixed few inconsistent ZVALs in AST produced by compiler (REFCOUNTED and INTERNED strings)
fandrieu [Tue, 31 Oct 2017 21:33:10 +0000 (17:33 -0400)]
Fix #74243: allow locales.conf to drive datetime format
Add a driver attribute, PDO::DBLIB_ATTR_DATETIME_CONVERT, to control.
Adam Baratz [Tue, 31 Oct 2017 20:43:26 +0000 (16:43 -0400)]
Use size_t instead of int, use more specific format string
Dmitry Stogov [Tue, 31 Oct 2017 15:51:35 +0000 (18:51 +0300)]
Use interned strings for persistent stream wrappers and filters
Nikita Popov [Tue, 31 Oct 2017 14:20:34 +0000 (15:20 +0100)]
Use known strings for reflection properties
Sammy Kaye Powers [Mon, 30 Oct 2017 20:06:33 +0000 (15:06 -0500)]
Remove decade-old commented-out code
Dmitry Stogov [Tue, 31 Oct 2017 12:41:51 +0000 (15:41 +0300)]
Change checks that should be always true into ZEND_ASSERT() (some edge cases may be trapped here).
Dmitry Stogov [Tue, 31 Oct 2017 12:39:39 +0000 (15:39 +0300)]
Workaroud for inconsistent ZVALs in AST produced by compiler (strings may be REFCOUNTED and INTERNED at the same time).
Dmitry Stogov [Tue, 31 Oct 2017 12:36:55 +0000 (15:36 +0300)]
Intern file names and class constants in first place (they may be interned later during constant substitution)
Dmitry Stogov [Tue, 31 Oct 2017 12:35:44 +0000 (15:35 +0300)]
Always calculate calculate string hash value on attempt of interning
Dmitry Stogov [Tue, 31 Oct 2017 12:35:14 +0000 (15:35 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fix year
Add /nologo
These functions are always available, exif can't be cross version compiled anyway
Anatol Belski [Tue, 31 Oct 2017 09:38:54 +0000 (10:38 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix year
Add /nologo
Anatol Belski [Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix year
Add /nologo
Anatol Belski [Tue, 31 Oct 2017 09:35:59 +0000 (10:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix year
Add /nologo
Anatol Belski [Tue, 31 Oct 2017 09:25:15 +0000 (10:25 +0100)]
Fix year
Anatol Belski [Tue, 31 Oct 2017 09:24:34 +0000 (10:24 +0100)]
Add /nologo
Dmitry Stogov [Tue, 31 Oct 2017 08:07:42 +0000 (11:07 +0300)]
single check is enough
Kalle Sommer Nielsen [Tue, 31 Oct 2017 07:50:30 +0000 (08:50 +0100)]
These functions are always available, exif can't be cross version compiled anyway
Dmitry Stogov [Tue, 31 Oct 2017 07:43:10 +0000 (10:43 +0300)]
Added zend_hash_add_new_mem/zend_hash_str_add_new_mem. Use them to add new elements into PCRE cache (we checked the existance before).
Dmitry Stogov [Tue, 31 Oct 2017 07:35:28 +0000 (10:35 +0300)]
Improved zend_hash_str_add/update functions
Dmitry Stogov [Mon, 30 Oct 2017 23:16:46 +0000 (02:16 +0300)]
Use internet strings for EG(ini_entries)
Dmitry Stogov [Mon, 30 Oct 2017 22:20:38 +0000 (01:20 +0300)]
Nikita Popov [Mon, 30 Oct 2017 22:05:53 +0000 (23:05 +0100)]
Fix gc_029_zts.phpt test
ZTS and NTS now behave the same here, so reduce this back to a
single test.
Nikita Popov [Mon, 30 Oct 2017 21:48:20 +0000 (22:48 +0100)]
Remove some unnecessary duplications
Nikita Popov [Mon, 30 Oct 2017 21:00:42 +0000 (22:00 +0100)]
Remove zend_get_parameters(_ex) APIs
zend_get_parameters_ex() has been marked as deprecated for a long
time already. What zend_get_paramers() does is even more
questionable under PHP7. Both functions are obsoleted by the ZPP
mechanism, so I'm dropping them.
Dmitry Stogov [Mon, 30 Oct 2017 20:13:10 +0000 (23:13 +0300)]
Prevent reference-counting on persistent zvals (internal constants, default properties and constants of internal classes).
New macro ZVAL_COPY_OR_DUP() is used perform duplication, if necessary.
This should eliminate related race-coditions in ZTS build and prevent reference-counting bugs after unclean shutdown.
Christoph M. Becker [Mon, 30 Oct 2017 20:04:59 +0000 (21:04 +0100)]
Implemented request #62055 (Make run-tests.php support --CGI-- sections)
Not regarding the CGI section might even been seen as a bug, and since
server-tests.php appears to broken, anway[1][2], we implement it for
run-tests.php in the way as described[3] for server-tests.php, i.e.
respective tests are skipped if no CGI executable is found.
[1] <https://github.com/php/php-src/pull/222#commitcomment-
2064387 >
[2] <https://github.com/php/php-src/pull/1811#issuecomment-
256677997 >
[3] <https://qa.php.net/phpt_details.php#cgi_section>
Anatol Belski [Mon, 30 Oct 2017 18:48:21 +0000 (19:48 +0100)]
Rethink the version checks
As the actual behavior change happens with ICU >= 58, the new
functionality should stay same in the lower versions. This comply also
with lower PHP versions so far.
Anatol Belski [Mon, 30 Oct 2017 17:28:39 +0000 (18:28 +0100)]
Fix typo
Anatol Belski [Mon, 30 Oct 2017 17:21:14 +0000 (18:21 +0100)]
Proper ICU version check for restriction levels availability
Anatol Belski [Mon, 30 Oct 2017 17:17:20 +0000 (18:17 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Add missing ICU version check
Anatol Belski [Mon, 30 Oct 2017 17:16:47 +0000 (18:16 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add missing ICU version check
Anatol Belski [Mon, 30 Oct 2017 17:16:03 +0000 (18:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add missing ICU version check
Anatol Belski [Mon, 30 Oct 2017 17:15:26 +0000 (18:15 +0100)]
Add missing ICU version check
Jakub Zelenka [Mon, 30 Oct 2017 16:44:33 +0000 (16:44 +0000)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Mon, 30 Oct 2017 16:43:36 +0000 (16:43 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Mon, 30 Oct 2017 16:42:23 +0000 (16:42 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Mon, 30 Oct 2017 16:36:38 +0000 (16:36 +0000)]
Prevent leaking x509 and csr resources if it is not requested
All functions using php_openssl_x509_from_zval or php_openssl_csr_from_zval
with makeresource equal to 0 do not deref the resource which means there
is a leak till the end of the request. This can cause issues for long
running apps. It is a generic solution for bug #75363 which also covers
other functions.
Jakub Zelenka [Mon, 30 Oct 2017 16:05:00 +0000 (16:05 +0000)]
Extend and speed up pkey export tests
Jakub Zelenka [Mon, 30 Oct 2017 14:29:05 +0000 (14:29 +0000)]
Rewrite openssl_csr_get_subject test to improve coverage
Jakub Zelenka [Mon, 30 Oct 2017 14:28:18 +0000 (14:28 +0000)]
Add openssl_csr_get_public_key test
Jakub Zelenka [Mon, 30 Oct 2017 14:16:03 +0000 (14:16 +0000)]
Extend openssl_pkcs7_* tests to cover resource cert
Jakub Zelenka [Mon, 30 Oct 2017 14:15:23 +0000 (14:15 +0000)]
Fix cleaning tmp output file in openssl_csr_export_to_file test
Jelle van der Waa [Fri, 11 Aug 2017 22:58:59 +0000 (00:58 +0200)]
openssl: add basic openssl_csr_export_to_file tests
Add a basic test for openssl_csr_export_to_file.
Jakub Zelenka [Mon, 30 Oct 2017 13:57:51 +0000 (13:57 +0000)]
Extend openssl_csr_sign test to cover cert resource
Jakub Zelenka [Mon, 30 Oct 2017 13:40:06 +0000 (13:40 +0000)]
Set different invalid path in openssl_pkcs12_export so it is more unlikely to exist
Jakub Zelenka [Mon, 30 Oct 2017 13:36:32 +0000 (13:36 +0000)]
Extend openssl_x509_parse to cover cert resource
Jakub Zelenka [Mon, 30 Oct 2017 13:17:32 +0000 (13:17 +0000)]
Rename and test resource cert in openssl_x509_checkpurpose test
Jakub Zelenka [Mon, 30 Oct 2017 13:01:27 +0000 (13:01 +0000)]
Extend openssl_x509_check_private_key to test resource cert
Jakub Zelenka [Mon, 30 Oct 2017 12:55:29 +0000 (12:55 +0000)]
Extend openssl_x509_fingerprint test to cover resource cert with sha1
Dmitry Stogov [Mon, 30 Oct 2017 15:37:03 +0000 (18:37 +0300)]
Fixed test
Sara Golemon [Mon, 30 Oct 2017 15:07:16 +0000 (11:07 -0400)]
Revert array_slice passthrough optimization
This reverts commit
fabb5b7a7421280b43e6f11c59d9446f6b21e3e6 .
This reverts commit
e751e6cebad959592f223f99ffd2a60cdf51bed0 .
Joe Watkins [Mon, 30 Oct 2017 14:16:38 +0000 (14:16 +0000)]
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:/php-src:
Yet one attempt to mitigate the unzip error on AppVeyor
Ensure SDK is checked out before asking for version
Fix fetching the SDK version
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Remove status check on the SDK repo and add version check
Use abbrev
Catch with the latest AppVeyor unzip errors
Fixed type inference
Joe Watkins [Mon, 30 Oct 2017 14:16:27 +0000 (14:16 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Yet one attempt to mitigate the unzip error on AppVeyor
Ensure SDK is checked out before asking for version
Fix fetching the SDK version
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Remove status check on the SDK repo and add version check
Use abbrev
Catch with the latest AppVeyor unzip errors
Fixed type inference
Joe Watkins [Mon, 30 Oct 2017 14:16:16 +0000 (14:16 +0000)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Yet one attempt to mitigate the unzip error on AppVeyor
Ensure SDK is checked out before asking for version
Fix fetching the SDK version
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Remove status check on the SDK repo and add version check
Catch with the latest AppVeyor unzip errors
Joe Watkins [Mon, 30 Oct 2017 14:14:31 +0000 (14:14 +0000)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
Joe Watkins [Mon, 30 Oct 2017 14:13:41 +0000 (14:13 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
Joe Watkins [Mon, 30 Oct 2017 14:13:16 +0000 (14:13 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
Fabien Villepinte [Mon, 30 Oct 2017 12:25:40 +0000 (13:25 +0100)]
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
Fabien Villepinte [Mon, 30 Oct 2017 11:51:03 +0000 (12:51 +0100)]
Fix bug #75461 Wrong reflection on SoapServer:setClass
Anatol Belski [Mon, 30 Oct 2017 11:20:52 +0000 (12:20 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Yet one attempt to mitigate the unzip error on AppVeyor
Anatol Belski [Mon, 30 Oct 2017 11:20:24 +0000 (12:20 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Yet one attempt to mitigate the unzip error on AppVeyor
Anatol Belski [Mon, 30 Oct 2017 11:17:53 +0000 (12:17 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Yet one attempt to mitigate the unzip error on AppVeyor
Anatol Belski [Mon, 30 Oct 2017 11:16:53 +0000 (12:16 +0100)]
Yet one attempt to mitigate the unzip error on AppVeyor
Anatol Belski [Mon, 30 Oct 2017 11:09:39 +0000 (12:09 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Ensure SDK is checked out before asking for version
Anatol Belski [Mon, 30 Oct 2017 11:09:15 +0000 (12:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Ensure SDK is checked out before asking for version
Anatol Belski [Mon, 30 Oct 2017 11:08:50 +0000 (12:08 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Ensure SDK is checked out before asking for version
Anatol Belski [Mon, 30 Oct 2017 11:07:27 +0000 (12:07 +0100)]
Ensure SDK is checked out before asking for version
Anatol Belski [Mon, 30 Oct 2017 10:31:03 +0000 (11:31 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix fetching the SDK version
Anatol Belski [Mon, 30 Oct 2017 10:30:19 +0000 (11:30 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix fetching the SDK version
Anatol Belski [Mon, 30 Oct 2017 10:29:40 +0000 (11:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix fetching the SDK version
Anatol Belski [Mon, 30 Oct 2017 10:28:32 +0000 (11:28 +0100)]
Fix fetching the SDK version
Xinchen Hui [Mon, 30 Oct 2017 10:21:19 +0000 (18:21 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Xinchen Hui [Mon, 30 Oct 2017 10:21:00 +0000 (18:21 +0800)]
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:/php-src:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Xinchen Hui [Mon, 30 Oct 2017 10:20:20 +0000 (18:20 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Xinchen Hui [Mon, 30 Oct 2017 10:17:50 +0000 (18:17 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Use abbrev
Xinchen Hui [Mon, 30 Oct 2017 10:17:41 +0000 (18:17 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use abbrev
Xinchen Hui [Mon, 30 Oct 2017 10:17:27 +0000 (18:17 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 10:17:06 +0000 (11:17 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Anatol Belski [Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Anatol Belski [Mon, 30 Oct 2017 10:15:51 +0000 (11:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Dmitry Stogov [Mon, 30 Oct 2017 09:56:08 +0000 (12:56 +0300)]
ws
Anatol Belski [Mon, 30 Oct 2017 09:53:12 +0000 (10:53 +0100)]
Fix SDK version comparison and add more verbosity
Dmitry Stogov [Mon, 30 Oct 2017 09:47:22 +0000 (12:47 +0300)]
Update UPGRADING.INTERNALS
Anatol Belski [Mon, 30 Oct 2017 09:34:11 +0000 (10:34 +0100)]
Don't use the cache dependency, SDK version is handled in script
Dmitry Stogov [Mon, 30 Oct 2017 09:32:22 +0000 (12:32 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:17:55 +0000 (10:17 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:17:25 +0000 (10:17 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:16:39 +0000 (10:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove status check on the SDK repo and add version check