clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,642 Commits 494 Branches 1,367 Tags 801 MiB
748433e7bc
Commit Graph

88642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikita Popov
b0055678bf Fix CLI test and drop some now unnecessary code 2015-03-09 14:09:34 +01: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
2f156c61f1 Add UPDRADING note about yield operator behavior 
Fixes bug #69160.
[ci skip]
 2015-03-09 12:41:33 +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
Xinchen Hui
eed3419802 Merge branch 'PHP-5.6' 2015-03-09 17:14:55 +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
Xinchen Hui
711ee5e4e1 Update NEWs 2015-03-09 17:13:47 +08:00
Xinchen Hui
b0ec8dfd0d Update news 2015-03-09 17:09:57 +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
Reeze Xia
2a2c74997d Now opened_path is a zend_string 2015-03-09 16:12:53 +08:00
Xinchen Hui
f66bef2414 Fixed build 2015-03-09 15:50:52 +08:00
Wei Dai
22a61cea33 Fixed build 2015-03-09 15:21:08 +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
Stanislav Malyshev
0f333fa93c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added missing parentheses
  Fix #67626
  Fix #63486

Conflicts:
	main/streams/userspace.c
 2015-03-08 23:41:30 -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
c7de82b0d9 Add note of group use 2015-03-09 12:08:34 +08:00
Xinchen Hui
7bf082d638 Merge branch 'filter/adjust-logic' of https://github.com/whatthejeff/php-src 2015-03-09 11:43:10 +08:00
Xinchen Hui
96f7a33df6 Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers 2015-03-09 11:19:05 +08:00
Stanislav Malyshev
69d183dd19 Merge branch 'pull-request/1049' 
* pull-request/1049:
  Rename __callstatic (internal name) to __callStatic (userland name) in error message
 2015-03-08 17:57:47 -07: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
6adac79a73 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add missing value for error_reporting directive
 2015-03-08 17:05:59 -07:00
Stanislav Malyshev
b0d1e23646 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add missing value for error_reporting directive
 2015-03-08 17:05:51 -07:00
Stanislav Malyshev
d7931f8f66 Merge branch 'pull-request/1130' into PHP-5.5 
* pull-request/1130:
  Add missing value for error_reporting directive
 2015-03-08 17:05:37 -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
Stanislav Malyshev
90b8898d22 Merge branch 'pull-request/1127' 
* pull-request/1127:
  merge ZEND_SIGNED_MULTIPLY_LONG for i386 and x86_64
 2015-03-08 17:02:48 -07:00
Stanislav Malyshev
1446bf5ebf Adding notes regarding implementation of FR #69089 2015-03-08 16:51:00 -07:00
Stanislav Malyshev
fdc46d790b Merge branch 'pull-request/1070' 
* pull-request/1070:
  More docs for /win32/build/confutils.js
  Adding some inline docs/docs cleanup
 2015-03-08 16:46:15 -07:00