1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Commit Graph

31598 Commits

Author SHA1 Message Date
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
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
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 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 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
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
Dmitry Stogov c8758c91a7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 12:10:06 +04:00
Pierre Joye d0cd049312 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix possible NULL deref
2013-04-09 10:09:54 +02:00
Pierre Joye 24f1045d55 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix possible NULL deref
2013-04-09 10:09:47 +02:00
Pierre Joye aab5659357 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix possible NULL deref
2013-04-09 10:09:36 +02:00
Dmitry Stogov 255ed92b34 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed ZTS build
2013-04-09 12:09:33 +04:00
Pierre Joye 88b3cdc4e9 fix possible NULL deref 2013-04-09 10:09:17 +02:00
Pierre Joye 1359eaa057 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-09 10:06:49 +02:00
Pierre Joye eb7d0ce3b0 Merge branch 'master' of git.php.net:php-src 2013-04-09 10:06:00 +02:00
Pierre Joye f4308084d8 Merge branch 'PHP-5.5'
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:41 +02:00
Pierre Joye 4d6c367177 Merge branch 'PHP-5.4' into PHP-5.5
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:32 +02:00
Pierre Joye 10d62de4aa Merge branch 'PHP-5.3' into PHP-5.4
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:17 +02:00
Pierre Joye 4d4adf47e0 fix null deref 2013-04-09 10:04:01 +02:00
Dmitry Stogov 4bf1f3801b Fixed ZTS build 2013-04-09 12:03:41 +04:00
Dmitry Stogov 1d8b6de2a4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
2013-04-09 11:59:30 +04:00
Dmitry Stogov 4cf00c08bd Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function) 2013-04-09 11:57:28 +04:00
Dmitry Stogov 68d567d56c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #82 (allow comments in blacklist file, lines started with ";")
2013-04-09 10:53:12 +04:00
Dmitry Stogov d9c9e78369 Fixed issue #82 (allow comments in blacklist file, lines started with ";") 2013-04-09 10:51:19 +04:00
Pierre Joye 396b1109cf Merge branch 'PHP-5.5'
* PHP-5.5:
  ws and comment for recommended aa method
2013-04-09 07:05:03 +02:00
Pierre Joye 83500123d0 ws and comment for recommended aa method 2013-04-09 07:04:52 +02:00
Pierre Joye ec136c219e Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-09 06:47:21 +02:00
Pierre Joye 28a9181ceb Merge branch 'master' of git.php.net:php-src 2013-04-09 06:46:58 +02:00