clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,308 Commits 494 Branches 1,367 Tags 803 MiB
6923f081b7
Commit Graph

89308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferenc Kovacs
6923f081b7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  oop, put both the error number and message for both db object to the error message
 2015-04-01 23:06:32 +02:00
Ferenc Kovacs
e70e2d8310 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  oop, put both the error number and message for both db object to the error message
 2015-04-01 23:06:22 +02:00
Ferenc Kovacs
7c1a1189be oop, put both the error number and message for both db object to the error message 2015-04-01 23:06:04 +02:00
Ferenc Kovacs
0328a60eec Merge branch 'PHP-5.6' 
* PHP-5.6:
  test fixes
 2015-04-01 22:08:29 +02:00
Ferenc Kovacs
faab430141 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  test fixes
 2015-04-01 22:08:11 +02:00
Ferenc Kovacs
0a41af216e test fixes 2015-04-01 22:07:52 +02:00
Stanislav Malyshev
4975019dd7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"

Conflicts:
	ext/date/php_date.c
	ext/date/tests/DateTime_verify.phpt
 2015-04-01 12:50:40 -07:00
Stanislav Malyshev
2d9399af35 Revert "Merge branch 'PHP-5.5' into PHP-5.6" 
This reverts commit aa22e80b1a, reversing
changes made to 3e7f47cb03.

Conflicts:
	ext/date/php_date.c
 2015-04-01 12:49:25 -07:00
Dmitry Stogov
ec760d8fff Convert fatal errors into EngineExceptions 2015-04-01 20:01:57 +03:00
Ferenc Kovacs
0295d89d45 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix typo: unitialized -> uninitialized
 2015-04-01 18:06:12 +02:00
Ferenc Kovacs
978128b446 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix typo: unitialized -> uninitialized
 2015-04-01 18:05:57 +02:00
Ferenc Kovacs
9ec3e7d98c Merge branch 'pr-1212' into PHP-5.5 
* pr-1212:
  Fix typo: unitialized -> uninitialized
 2015-04-01 18:05:36 +02:00
Lior Kaplan
3b8b1435ad Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized

Conflicts:
	ext/xmlwriter/php_xmlwriter.c
 2015-04-01 18:30:55 +03:00
Lior Kaplan
3409d87eab Fix typo: unitialized -> uninitialized 2015-04-01 18:21:01 +03:00
Lior Kaplan
2fd74c7f03 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix typo: unitialized -> uninitialized
 2015-04-01 18:20:26 +03:00
Lior Kaplan
87cc7caa10 Fix typo: unitialized -> uninitialized 2015-04-01 18:19:09 +03:00
Lior Kaplan
59c2a55ec7 Fix typo: unitialized -> uninitialized 2015-04-01 18:17:53 +03:00
Dmitry Stogov
780a8123fe Convert fatal errors into EngineExceptions 2015-04-01 16:48:15 +03:00
Dmitry Stogov
0cad725886 Convert fatal errors into EngineExceptions 2015-04-01 15:54:03 +03:00
Dmitry Stogov
8c031a3f95 Handle incorrect break/continue statements at compile-time 2015-04-01 15:52:26 +03:00
Dmitry Stogov
4fd93a4da6 Converted fatal errors into EngineExceptions 2015-04-01 14:50:09 +03:00
Anatol Belski
a0eaa37afe missing includes 2015-04-01 13:39:25 +02:00
Anatol Belski
e271ace5f8 fix extern "C" 
now, it shouldn't matter where intl_common.h is included,
not need for extra putting it into extern C
 2015-04-01 13:18:52 +02:00
Anatol Belski
ca1ef2749d C89 compat 2015-04-01 13:18:51 +02:00
Anatol Belski
056f8265a1 add ext/odbc note to UPGRADING 2015-04-01 13:18:50 +02:00
Dmitry Stogov
18f3d5490a Convert fatal error into EngineException 2015-04-01 13:49:11 +03:00
Dmitry Stogov
3ba4c7a137 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Remove datefmt_set_timezone_id and OO variant
 2015-04-01 13:39:11 +03:00
Dmitry Stogov
1d75953a86 We don't need this protection anymore (now reference counting on closures is accurate). 2015-04-01 13:38:05 +03:00
Nikita Popov
cf0ffa8e4c Remove datefmt_set_timezone_id and OO variant 2015-04-01 12:34:28 +02:00
Dmitry Stogov
acfc31c0f8 Use zend_error_noreturn() for fatal errors 2015-04-01 13:32:23 +03:00
Nikita Popov
ac470ddf1c More UPGRADING 2015-04-01 11:50:46 +02:00
Nikita Popov
085774997b Drop support for static calls from incompatible context 
Implemented by NULLing $this.
 2015-04-01 11:42:05 +02:00
Nikita Popov
7c67727082 Add some notes to UPGRADING 2015-04-01 11:17:55 +02:00
Nikita Popov
8d00385871 Reclassify E_STRICT notices 
Per RFC https://wiki.php.net/rfc/reclassify_e_strict

While reviewing this, found that there are still three E_STRICTs
left in libraries - need to discuss those.
 2015-04-01 11:17:55 +02:00
Dmitry Stogov
4796e0242b Merge branch 'InternalClassClean' 
* InternalClassClean:
  Fixed test
  Patch improvement:
  Fixed indentation. Fixed comment style. Fixed commented out code.
  Reverted change to function name and added note of why it is different from the class it is actually changing.
  Made UConverter throw an exception if the constructor fails.
  Fixed PDO constructor to not return null.
  Fixed fileinfo behaviour.
  Made Phar throw exception on bad constructor.
  Converted intl extension to use IntlException in constructors.
  Fixed SplFixedArray and tests.
  Fixed ReflectionExtension and ReflectionProperty.
  Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
  Fixed PDORow behaviour and message.
 2015-04-01 12:11:13 +03:00
Nikita Popov
52fcc74875 Fix 32bit test failures due to ctor deprecation 2015-04-01 09:36:43 +02:00
Xinchen Hui
fd0baec2e9 Merge branch 'master' of https://git.php.net/repository/php-src 2015-04-01 13:06:38 +08:00
Xinchen Hui
af812eac4c Micro opt 2015-04-01 12:05:19 +08:00
Xinchen Hui
ed772e1a99 Fixed test 2015-04-01 09:56:55 +08:00
Ferenc Kovacs
a2752faaa8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix release date
 2015-04-01 01:42:26 +02:00
Ferenc Kovacs
8de838dc26 fix release date 2015-04-01 01:42:12 +02:00
Ferenc Kovacs
7a84967ba7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.6.9 is up next
 2015-04-01 01:31:48 +02:00
Ferenc Kovacs
a5e68f72a7 5.6.9 is up next 2015-04-01 01:30:51 +02:00
Lior Kaplan
9df685ef90 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)

Conflicts:
	ext/ereg/regex/regcomp.c
 2015-04-01 01:59:21 +03:00
Lior Kaplan
04c9271805 Add changelog entries for #68677, #68739 & #68740 2015-04-01 01:55:35 +03:00
Lior Kaplan
c22543b3f3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)
 2015-04-01 01:54:53 +03:00
Lior Kaplan
a32c8ba719 Fixed bug #68739 (Missing break / control flow). 
Fixed bug #68740 (NULL Pointer Dereference).
Fixed bug #68677 (Use After Free).
 2015-04-01 01:45:34 +03:00
Xinchen Hui
1add8401a3 Fixed bug #68739 (Missing break / control flow in curl) 
(cherry picked from commit 124fb22a13)
 2015-04-01 01:24:26 +03:00
Xinchen Hui
059e774db0 Fixed bug #68740 (NULL Pointer Dereference) 
(cherry picked from commit 124fb22a13)
 2015-04-01 01:24:26 +03:00
Xinchen Hui
0a8f28b432 Fixed bug #68677 (Use After Free in OPcache) 
(cherry picked from commit 777c39f404)
 2015-04-01 01:24:16 +03:00