php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
88,653 Commits 549 Branches 1,485 Tags
ea2e1972245f57cd7c09e82c3e16d72d51df00dc
Commit Graph

38021 Commits

Author SHA1 Message Date
Dmitry Stogov a30d328671 Errors converted to exceptions are not "recoverable" anymore. 2015-03-10 10:31:55 +03:00
Xinchen Hui d25acb5fd0 Revert "Fixed phar file action failure after engine exception rfc been merged" 
This reverts commit f174859acd.
 2015-03-10 15:03:15 +08:00
Daniel Lowrey c5c4d22c10 Deprecate "session_meta_capture" SSL context option 
Meta data about encrypted streams is now available as part of the
"crypto" key in the array returned by stream_get_meta_data(). This
update deprecates the use of the "session_meta_capture" ssl
context option in encrypted streams.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey 2dec21634c Revert "Add stream_socket_crypto_info() function" 
This reverts commit 13acb7ec65.

With the added capability to negotiate application layer protocols
via the TLS ALPN extension userland needs a method to access the
negotiated protocol on a given stream. The reverted commit added
a new stream_socket_crypto_info() function for this purpose.

This original approach was discarded in favor of using the
already-existing stream_get_meta_data() API which specifically
exists for just such purposes and requires the addition of no new
functions.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey 676a5059b2 Add crypto info to stream_get_meta_data() result on encrypted streams 
A "crypto" key is added to the output of stream_get_meta_data() calls
when invoked using a stream on which crypto is currently active. The
new key's associated array contains the following keys:

 - protocol (string e.g. TLSv1.2, TLSv1.1, etc)
 - cipher_name (string)
 - cipher_bits (int)
 - cipher_version (string)

If the TLS ALPN extension was used to successfully negotiate an
application protocol that protocol's identifier is stored in the
following key:

 - alpn_protocol

If no ALPN protocol was negotiated the "alpn_protocol" key is not
present in the crypto meta data array. More meta information
concerning the stream's active encryption state may be added in the
future.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey 748433e7bc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix crypto stream timeout regressions

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-09 16:02:04 -06:00
Daniel Lowrey 69691cc8ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix crypto stream timeout regressions
 2015-03-09 15:55:33 -06:00
Daniel Lowrey bbfd4a5e62 Fix crypto stream timeout regressions 2015-03-09 15:53:26 -06:00
Reeze Xia f174859acd Fixed phar file action failure after engine exception rfc been merged 2015-03-09 17:07:18 +00:00
Xinchen Hui 47f2e42fc9 Remove PHAR_GLOBALS (make it respect ZEND_ENABLE_STATIC_TSRMLS_CACHE) 2015-03-09 23:00:56 +08:00
Dmitry Stogov 1c94ff0595 Implement engine exceptions 
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.
 2015-03-09 14:01:32 +01:00
Nikita Popov a4262827ea Fix ReflectionFunction::isDeprecated() test 
We currently don't have deprecated functions ... so just switch
this to testing a non-deprecated function.
 2015-03-09 12:27:06 +01:00
Nikita Popov 7810659cc3 Removed deprecated mcrypt_ecb() etc 2015-03-09 11:37:13 +01:00
Nikita Popov c488a45701 Remove deprecated mcrypt_generic_end() alias 2015-03-09 11:10:52 +01:00
Nikita Popov a81e65a501 Remove xsl.security_prefs ini option 
Conflicts:
	ext/xsl/php_xsl.c
	ext/xsl/xsltprocessor.c
 2015-03-09 11:06:18 +01:00
Nikita Popov b5184ef336 Remove unsafe curl file uploads 
The option CURLOPT_SAFE_UPLOAD still exists, but cannot be disabled.
 2015-03-09 11:00:04 +01:00
Xinchen Hui c24afc8d8f Revert commit by mistake 2015-03-09 17:27:51 +08:00
Xinchen Hui 64bbc98dff Merge branch 'PHP-5.6' 
Conflicts:
	ext/mysqli/php_mysqli_structs.h
 2015-03-09 17:23:34 +08:00
Xinchen Hui 4ca14f681e Merge branch 'PHP-5.5' into PHP-5.6 2015-03-09 17:23:04 +08:00
Xinchen Hui 9af1383a3f Revert "Fix #63486" 
This reverts commit f4c96ffcb5.
 2015-03-09 17:22:56 +08:00
Jeff Welch fdbdb11514 Fix #69202: FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used. 2015-03-09 17:14:47 +08:00
Jeff Welch 66a2c528fe Fix #69202: FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used. 2015-03-09 17:08:35 +08:00
Xinchen Hui f66bef2414 Fixed build 2015-03-09 15:50:52 +08:00
Masaki Kagaya 9d81d7ff70 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:45:11 -07:00
Julien Pauli 2f06413340 Fix #67626 2015-03-08 23:45:11 -07:00
Julien Pauli 37ecfdad09 Fix #63486 2015-03-08 23:41:46 -07:00
Masaki Kagaya 934d6ed900 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:40:56 -07:00
Julien Pauli 7d47d9fe23 Fix #67626 2015-03-08 23:40:55 -07:00
Julien Pauli 7684d72df8 Fix #63486 2015-03-08 23:40:55 -07:00
Masaki Kagaya fa72f1ea86 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:39:04 -07:00
Stanislav Malyshev a8da0a9620 Merge branch 'pull-request/1104' into PHP-5.5 
* pull-request/1104:
  Fix #63486
 2015-03-08 23:21:53 -07:00
Stanislav Malyshev 43b426fbc4 Merge branch 'pull-request/1106' into PHP-5.5 
* pull-request/1106:
  Fix #67626
 2015-03-08 22:52:21 -07:00
Xinchen Hui 7bf082d638 Merge branch 'filter/adjust-logic' of https://github.com/whatthejeff/php-src 2015-03-09 11:43:10 +08:00
Stanislav Malyshev 33ef5c47a5 Merge branch 'pull-request/1135' 
* pull-request/1135:
  Return void like other functions
  Use zend_parse_parameters_none()
  Implemented FR #45235 A way to clear or reset the results for error_get_last()
 2015-03-08 17:26:38 -07:00
Stanislav Malyshev a8a77fff5c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:32 -07:00
Stanislav Malyshev dcc031470a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:25 -07:00
Stanislav Malyshev a2a20d29a8 Merge branch 'pull-request/1134' into PHP-5.5 
* pull-request/1134:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:02 -07:00
Stanislav Malyshev 876a9be3ee Merge branch 'pull-request/1129' 
* pull-request/1129:
  Array - make krsort FAST_ZPP compatibility
 2015-03-08 17:04:13 -07:00
Jeff Welch 1dc5bd47d8 Adjust logic in sanity checks. 
The code should return false when the provided options argument is neither an
array nor a valid filter.
 2015-03-08 15:27:41 -04:00
Anatol Belski d5558138d7 partially revert wrong merge 2015-03-08 20:05:34 +01:00
Anatol Belski bae44417a8 after merge fix 2015-03-08 19:56:31 +01:00
Anatol Belski 12babf59c1 updated libmagic.patch 2015-03-08 19:48:05 +01:00
Anatol Belski 316b1e0267 catching up 2015-03-08 19:48:01 +01:00
Anatol Belski 3e8a5485e2 catching up 2015-03-08 19:47:59 +01:00
Anatol Belski eeb74b0ab8 regenerated data file 2015-03-08 19:47:53 +01:00
Anatol Belski f54cf1ec57 more after patch fixes 2015-03-08 19:47:50 +01:00
Anatol Belski 1ebe527757 restore good patch parts 2015-03-08 19:47:48 +01:00
Anatol Belski 75a1392fb5 stat is done by php 2015-03-08 19:47:42 +01:00
Anatol Belski 49dc53722b use zend_strndup 2015-03-08 19:47:41 +01:00
Anatol Belski 1b77e51ad7 started to patch for libmagic.next 
everything is broken yet
 2015-03-08 19:47:38 +01:00