php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 05:32:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,701 Commits 547 Branches 1,481 Tags
7daabc42a2811bb995bb2e8056e992fd8b8b48d7
Commit Graph

73701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
7daabc42a2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
 2013-03-20 09:15:46 +01:00
Anatol Belski
bf8026aacf updated NEWS 2013-03-20 09:15:16 +01:00
Anatol Belski
0125ec77d2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
 2013-03-20 09:14:13 +01:00
Anatol Belski
0881ff0466 updated NEWS 2013-03-20 09:13:13 +01:00
Anatol Belski
06a526be3e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently
 2013-03-20 09:12:33 +01:00
Anatol Belski
bb935ff8dc Fixed bug #64452 Zip PHPTs crash intermittently 2013-03-20 09:10:10 +01:00
Stanislav Malyshev
b5a7675836 Merge branch 'PHP-5.5' 
* PHP-5.5:
  clarify NEWS
 2013-03-19 23:26:42 -07:00
Stanislav Malyshev
5aaff8d634 clarify NEWS 2013-03-19 22:32:50 -07:00
Anatol Belski
1cdf2c49ba Merge branch 'PHP-5.5' 
* PHP-5.5:
  Backported fix for bug #62852
 2013-03-19 21:23:08 +01:00
Anatol Belski
cb76420fe0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Backported fix for bug #62852
 2013-03-19 21:22:49 +01:00
Anatol Belski
cfd096fd7c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Backported fix for bug #62852
 2013-03-19 21:22:09 +01:00
Anatol Belski
8d199c7c4f Backported fix for bug #62852 2013-03-19 21:19:55 +01:00
David Soria Parra
d9f5056dba Merge branch 'PHP-5.5' 
* PHP-5.5:
  Refer to Zend Optimizer as Zend Opcache from now on
 2013-03-19 16:21:14 +01:00
David Soria Parra
5e55c6d9fd Refer to Zend Optimizer as Zend Opcache from now on 2013-03-19 16:20:37 +01:00
David Soria Parra
12877372ac Merge branch 'PHP-5.5' 
* PHP-5.5:
  ZO+ NEWS
 2013-03-19 15:55:36 +01:00
David Soria Parra
60b36a6819 ZO+ NEWS 2013-03-19 15:54:57 +01:00
Anatol Belski
da1aa323fe Merge branch 'master' of git.php.net:php-src 2013-03-19 15:16:16 +01:00
Anatol Belski
25b84546a8 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-19 15:15:31 +01:00
Anatol Belski
5cea998c5d Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix C89 compat
 2013-03-19 15:14:03 +01:00
Anatol Belski
b3d82845db fix C89 compat 2013-03-19 15:13:27 +01:00
David Soria Parra
d90a85c3bd Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix typos
 2013-03-19 15:11:56 +01:00
David Soria Parra
c542e969f2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix typos
 2013-03-19 15:11:48 +01:00
Carson McDonald
c6f6bf88d8 Fix typos 2013-03-19 15:11:34 +01:00
Anatol Belski
ce04268bb9 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-19 14:50:05 +01:00
Anatol Belski
11567299d5 Merge branch 'master' of git.php.net:php-src 2013-03-19 14:49:41 +01:00
David Soria Parra
7b876167cf Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix #48358 add() method for SplDoublyLinkedLis
 2013-03-19 14:48:05 +01:00
Mark Baker
4257469079 Fix #48358 add() method for SplDoublyLinkedLis 2013-03-19 14:46:21 +01:00
Anatol Belski
3b922794ab Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix C90 compat
 2013-03-19 14:45:57 +01:00
Anatol Belski
6f0f5d5281 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix C90 compat
 2013-03-19 14:44:20 +01:00
Anatol Belski
7687b8b81c fix C90 compat 2013-03-19 14:42:18 +01:00
Dmitry Stogov
b8ab827e4f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)
 2013-03-19 17:05:36 +04:00
Dmitry Stogov
4837bdb910 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)

Conflicts:
	NEWS
 2013-03-19 17:04:35 +04:00
Dmitry Stogov
7b0993bfb4 Fixed bug #63976 (Parent class incorrectly using child constant in class property) 2013-03-19 16:59:01 +04:00
Dmitry Stogov
e72d059a0c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Partial fix for bug #64239
 2013-03-19 15:48:22 +04:00
Dmitry Stogov
960d5be528 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Partial fix for bug #64239
 2013-03-19 15:47:43 +04:00
Dmitry Stogov
984561cfa8 Partial fix for bug #64239 2013-03-19 15:45:48 +04:00
Dmitry Stogov
baa5b3ef74 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
 2013-03-19 15:01:05 +04:00
Dmitry Stogov
74e11fb14c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #62343 (Show class_alias In get_declared_classes())

Conflicts:
	NEWS
 2013-03-19 15:00:24 +04:00
Dmitry Stogov
84630a1109 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
 2013-03-19 14:59:08 +04:00
Dmitry Stogov
4a6291508d Fixed bug #62343 (Show class_alias In get_declared_classes()) 2013-03-19 14:56:53 +04:00
Dmitry Stogov
b360d26294 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
 2013-03-19 13:08:14 +04:00
Dmitry Stogov
ef8c8eaa95 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)

Conflicts:
	NEWS
	Zend/zend_compile.c
 2013-03-19 13:07:32 +04:00
Dmitry Stogov
e62bb03257 Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error) 2013-03-19 12:48:23 +04:00
Dmitry Stogov
48e82b2988 Merge branch 'PHP-5.5' 
* PHP-5.5:
  strlen() returns size_t
 2013-03-19 10:45:57 +04:00
Dmitry Stogov
f621f0b8e7 strlen() returns size_t 2013-03-19 10:45:38 +04:00
Dmitry Stogov
48632d0fc4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Renamed Zend Optimizer+ into Zend OPcache
 2013-03-19 10:32:50 +04:00
Dmitry Stogov
a62ffb72f4 Renamed Zend Optimizer+ into Zend OPcache 2013-03-19 10:32:24 +04:00
Dmitry Stogov
d5174afb89 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add stats to phpinfo
 2013-03-19 10:19:01 +04:00
Dmitry Stogov
840c0d6091 Add stats to phpinfo 2013-03-19 10:17:44 +04:00
Dmitry Stogov
33ea10141d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Avoid trailing line break
 2013-03-18 13:36:52 +04:00