1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Commit Graph

74151 Commits

Author SHA1 Message Date
Xinchen Hui bcb223a626 Merge branch 'PHP-5.5' 2013-04-11 14:29:51 +08:00
Xinchen Hui a5cfe57e08 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-11 14:29:09 +08:00
Xinchen Hui ba292b037f Fixed bug (Wrong ce cached) 2013-04-11 14:28:42 +08:00
Pierre Joye e2f3c7f2bc Merge branch 'PHP-5.5'
* PHP-5.5:
  lucky that the name is not used, fix name of encoder
2013-04-11 07:08:58 +02:00
Pierre Joye e71b794569 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00
Remi Collet ab165d3465 Merge branch 'PHP-5.5'
* PHP-5.5:
  apply change from opcache readme to php.ini
2013-04-11 07:06:36 +02:00
Remi Collet 6df1e8d3fe apply change from opcache readme to php.ini 2013-04-11 07:05:56 +02:00
Pierre Joye 4475dbf11d Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-11 06:58:04 +02:00
Pierre Joye 684f4d5272 lucky that the name is not used, fix name of encoder 2013-04-11 06:42:38 +02:00
Dmitry Stogov 88e14d01bf Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 23:12:48 +04:00
Dmitry Stogov 6893a19dbf Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 23:12:25 +04:00
Dmitry Stogov b8867354c4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added opcache related entries
2013-04-10 23:11:35 +04:00
Dmitry Stogov 193e1865ad Added opcache related entries 2013-04-10 23:10:43 +04:00
Anatol Belski 622af62502 Merge branch 'master' of git.php.net:php-src 2013-04-10 20:52:29 +02:00
Anatol Belski 7133eee5f2 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-10 20:51:58 +02:00
Anatol Belski b6d54faa92 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-10 20:51:32 +02:00
Anatol Belski 9386ba9e97 Merge branch 'PHP-5.5'
* PHP-5.5:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:47:55 +02:00
Anatol Belski fc658f442d update NEWS 2013-04-10 20:47:28 +02:00
Anatol Belski 0655ab7c26 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:45:28 +02:00
Anatol Belski 782085bbfb updated NEWS 2013-04-10 20:44:41 +02:00
Anatol Belski ceb5b684e0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:40:28 +02:00
Anatol Belski 968ae4a56a Fixed bug #64342 ZipArchive::addFile() has to check for file existence 2013-04-10 20:39:17 +02:00
Pierre Joye 6ea7e6da8b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-10 20:15:03 +02:00
Pierre Joye ea14901ca4 Merge branch 'master' of git.php.net:php-src 2013-04-10 20:14:46 +02:00
Pierre Joye ca1962949e Merge branch 'PHP-5.5'
* PHP-5.5:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:14:00 +02:00
Pierre Joye 87f5d9aa1b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:46 +02:00
Pierre Joye c480bf3fb2 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:18 +02:00
Pierre Joye 224a67fb9f add external 2.1 detection and fix gd_compat for 2.1+ 2013-04-10 20:12:25 +02:00
Dmitry Stogov fd15a71184 Merge branch 'PHP-5.5'
* PHP-5.5:
  Allow wilcards in opcache.blacklist_filename
2013-04-10 21:42:50 +04:00
Dmitry Stogov af967de2af Allow wilcards in opcache.blacklist_filename 2013-04-10 21:41:30 +04:00
Dmitry Stogov 28a0c38ee4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed support for PHP-5.3
2013-04-10 21:27:54 +04:00
Dmitry Stogov e27039630a Fixed support for PHP-5.3 2013-04-10 21:27:06 +04:00
Dmitry Stogov 5868b93c49 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added missing ARG_INFO
2013-04-10 16:47:13 +04:00
Dmitry Stogov 2b3a4afcbf Added missing ARG_INFO 2013-04-10 16:45:59 +04:00
Dmitry Stogov 3353ba1105 Merge branch 'PHP-5.5'
* PHP-5.5:
  Numeric string constants used as array indeces have to be converted to long at compile time
2013-04-10 15:34:36 +04:00
Dmitry Stogov 7845f49006 Numeric string constants used as array indeces have to be converted to long at compile time 2013-04-10 15:33:08 +04:00
Johannes Schlüter c454c85511 Merge branch 'PHP-5.5' 2013-04-10 09:48:37 +02:00
Johannes Schlüter 2e3e87029f Merge branch 'PHP-5.4' into PHP-5.5 2013-04-10 09:48:15 +02:00
Johannes Schlüter 442ff25187 PHP 5.4.14 release date 2013-04-10 09:45:16 +02:00
Johannes Schlüter 146d786137 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-10 09:44:34 +02:00
Johannes Schlüter ecdf8bcc45 PHP 5.3.24 release date 2013-04-10 09:41:21 +02:00
Xinchen Hui d1643bd582 Merge branch 'PHP-5.5' 2013-04-10 13:48:38 +08:00
Michael Moravec 70668fd88a Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348) 2013-04-10 13:36:47 +08:00
David Soria Parra 1a8575ab05 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS section for next beta
  NEWS for PHP 5.5.0 Beta 3
2013-04-09 20:34:50 +02:00
David Soria Parra 1c498e6e94 NEWS section for next beta 2013-04-09 20:27:22 +02:00
David Soria Parra 6426a002e7 NEWS for PHP 5.5.0 Beta 3 2013-04-09 20:26:58 +02:00
Dmitry Stogov caa2bccb8f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed CFG construction bugs
2013-04-09 17:49:45 +04:00
Dmitry Stogov 2b28f29e53 Fixed CFG construction bugs 2013-04-09 17:48:45 +04:00
Dmitry Stogov 619fb50096 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix possible NULL deref
2013-04-09 12:11:26 +04:00
Dmitry Stogov e13d2c7c7f Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  fix possible NULL deref
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 12:10:54 +04:00