mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-13 06:24:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
90,575 Commits 505 Branches 1,389 Tags 777 MiB
103bf7eda0
Commit Graph

90575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Piotrowski
103bf7eda0 Add Throwable tests 2015-06-15 01:47:34 -05:00
Aaron Piotrowski
8e7e4fb608 Fix previous exception type check 2015-06-15 01:36:49 -05:00
Aaron Piotrowski
5ed1b8443d Updated UPGRADING with RFC link 2015-06-15 00:00:19 -05:00
Aaron Piotrowski
482985ca38 Changed AssertionException to AssertionError 2015-06-14 23:52:39 -05:00
Aaron Piotrowski
4d590ac35a Update exception error messages 2015-06-14 22:43:11 -05:00
Aaron Piotrowski
110e0a5a2c Merge branch 'master' into throwable-interface 
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
 2015-06-14 18:53:11 -05:00
vlakoff
6cb7b48846 Fix typo in PHP 7 upgrade notes 2015-06-14 18:35:16 +02:00
Bob Weinand
37c91b8d03 Fix off by one in short_circuiting optimization 2015-06-14 17:47:35 +02:00
Xinchen Hui
b7e477a8f9 Fixed bug #69831 (Segmentation fault in curl_getinfo) 2015-06-14 23:10:21 +08:00
Xinchen Hui
f1ae57f155 Simplify the condition 2015-06-14 22:56:06 +08:00
Bob Weinand
7221bd682f Revert "Revert "Expand optimizations regarding short-circuting a bit"" 
This reverts commit 3770a5ac66.
Fixes the bug which probably made make install fail on travis
(It never happened to me that all tests passed, but make install failed...)
 2015-06-14 15:46:11 +02:00
Anatol Belski
a0556ea64a update UPGRADING 2015-06-14 13:45:40 +02:00
Anatol Belski
241bba9dd9 update UPGRADING 2015-06-14 12:54:19 +02:00
Xinchen Hui
3770a5ac66 Revert "Expand optimizations regarding short-circuting a bit" 
This break the CI  (build error)

This reverts commit 3cfa58367b.
 2015-06-14 14:27:48 +08:00
Xinchen Hui
c196e86520 Fixed skipf 2015-06-14 13:44:39 +08:00
Xinchen Hui
dc37d3e8c2 Fixed Bug #69823 (PHP 7.0.0alpha1 segmentation fault when exactly 33 extensions are loaded) 2015-06-14 12:28:40 +08:00
Bob Weinand
3cfa58367b Expand optimizations regarding short-circuting a bit 2015-06-14 06:01:01 +02:00
Bob Weinand
b97944c6d1 Add ZEND_ASSERT_CHECK to phpdbg opcode jump list 2015-06-14 04:45:56 +02:00
Bob Weinand
f263932f38 Fix short-circuting (bug #69825) 2015-06-14 02:00:55 +02:00
Anatol Belski
6084844fb5 Fix bug #69814 Enabling php_curl, php_mysqli, and php_openssl causes php-cgi to crash 2015-06-13 18:45:27 +02:00
Christoph M. Becker
336cfac7f3 ext/mysql has been removed as of PHP 7.0.0 
So remove all related settings from php.ini-*, and add a respective entry in
UPGRADING (strangly, this part of fd1578c has been lost).
 2015-06-13 16:44:52 +02:00
Matteo Beccati
1f9df49139 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix copy/paste error in test
 2015-06-13 08:08:30 +02:00
Matteo Beccati
b564aa95be Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix copy/paste error in test
 2015-06-13 08:08:21 +02:00
Matteo Beccati
9e4d720825 Fix copy/paste error in test 2015-06-13 08:07:49 +02:00
Xinchen Hui
25cd356ed8 Revert "We are allowed to break ABI now..." 
This reverts commit 30a8000ca1.
 2015-06-13 11:05:05 +08:00
Xinchen Hui
30a8000ca1 We are allowed to break ABI now... 2015-06-13 11:03:50 +08:00
Xinchen Hui
20d85e4f02 typo 2015-06-13 10:56:30 +08:00
Xinchen Hui
829c7a1bb0 Merge branch 'master' of git.php.net:php-src 2015-06-13 10:51:15 +08:00
Xinchen Hui
d96dda8d49 Fixed Bug #69761 (Serialization of anonymous classes should be prevented) 
And also cleanup anonymous class compiling, it make no sense prefix a
namespace to anonymous class name. and it is always lowcased and
interned string.
 2015-06-13 10:49:20 +08:00
Anatol Belski
b148c50f48 Revert fix for bug #55407 
See 8e19705a93 and discussion on
github. The suggestion is to target a proper solution in in 7.1.
 2015-06-12 17:56:02 +02:00
Bob Weinand
7c2a0157c7 Cache the class_name typehint key in arg_info 
This leads to up to 2% improvement on one tested real world application by not having to always recalculate the lowercased string and its hash
 2015-06-12 17:26:53 +02:00
Anthony Ferrara
c8723564d4 Add line about scalar type declarations to UPGRADING 2015-06-12 10:05:07 -04:00
Xinchen Hui
49a8f801c7 Fixed bug #69805 (null ptr deref and seg fault in zend_resolve_class_name) 2015-06-12 21:07:23 +08:00
Dmitry Stogov
1c754f0b71 Get rid of more ZVAL_ZVAL() macros 2015-06-12 13:33:14 +03:00
Dmitry Stogov
8e10e8f921 Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places). 
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
 2015-06-12 12:33:23 +03:00
Matteo Beccati
730d7b8fca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_statement.c
 2015-06-12 02:08:30 +02:00
Matteo Beccati
3bb1a4ffe3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
 2015-06-12 02:07:02 +02:00
Matteo Beccati
b60efdce9f Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps) 2015-06-12 02:05:28 +02:00
Matteo Beccati
cd5b7e9688 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
	win32/install.txt
 2015-06-12 00:27:31 +02:00
Matteo Beccati
afa4c3e7c7 Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:21:48 +02:00
Matteo Beccati
7c0b8f872e Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:20:33 +02:00
Christoph M. Becker
9692e74b04 Merge branch 'master' of https://git.php.net/push/php-src 2015-06-11 23:58:34 +02:00
Christoph M. Becker
8de667b8d2 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2015-06-11 23:55:10 +02:00
Nikita Popov
5d3cf577aa Make convert_to_* safe with rc>1 
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.

All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).

What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.

Also fixes bug #69788.
 2015-06-11 23:23:57 +02:00
Christoph M. Becker
163f51a4cf Fixed bug #61574 - No MSI 
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
 2015-06-11 22:54:47 +02:00
Christoph M. Becker
d8223c4424 Fixed bug #61574 - No MSI 
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
 2015-06-11 22:52:30 +02:00
Christoph M. Becker
44b09b80f2 Fixed bug #61574 - No MSI 
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
 2015-06-11 22:44:14 +02:00
Nikita Popov
25098f0f5c Merge branch 'PHP-5.6' 2015-06-11 22:20:12 +02:00
Nikita Popov
1acf55eb75 Fixed bug #69803 2015-06-11 22:20:05 +02:00
Ferenc Kovacs
e3ed32d315 Merge branch 'PHP-5.6' 
* PHP-5.6:
  this is in 5.6.10, not in 5.6.9
 2015-06-11 20:31:22 +02:00