1
0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Commit Graph

44047 Commits

Author SHA1 Message Date
Dmitry Stogov 32edd8ff82 Merge branch 'PHP-7.1'
* PHP-7.1:
  Accorate handling of too big inodes of chroot directories
2016-11-17 01:15:08 +03:00
Dmitry Stogov 429bfbd4c2 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Accorate handling of too big inodes of chroot directories
2016-11-17 01:14:47 +03:00
Dmitry Stogov 27542d9c9d Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Accorate handling of too big inodes of chroot directories
2016-11-17 01:14:23 +03:00
Dmitry Stogov 9849c97b1b Accorate handling of too big inodes of chroot directories 2016-11-17 01:08:42 +03:00
Nikita Popov 778cd35bf5 Merge branch 'PHP-7.1' 2016-11-16 21:33:53 +01:00
Nikita Popov 592c10d37c Merge branch 'PHP-7.0' into PHP-7.1 2016-11-16 21:33:05 +01:00
Mitch Hagstrand 1d8be7c044 Fix #73546: Logging for opcache has an empty file name 2016-11-16 21:30:40 +01:00
Dmitry Stogov 08c8834a8d Merge branch 'PHP-7.1'
* PHP-7.1:
  "opcache.validate_root" is useless on Windows
  fix gcov coverage
2016-11-16 23:22:08 +03:00
Dmitry Stogov 09ac2bf752 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  "opcache.validate_root" is useless on Windows
2016-11-16 23:20:22 +03:00
Dmitry Stogov 71ee641327 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  "opcache.validate_root" is useless on Windows
2016-11-16 23:19:56 +03:00
Dmitry Stogov 935d922114 "opcache.validate_root" is useless on Windows 2016-11-16 23:15:14 +03:00
Dmitry Stogov d8ad071b5f Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix gcov coverage
2016-11-16 23:11:14 +03:00
Dmitry Stogov b3b2748ce9 Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
  fix gcov coverage
2016-11-16 23:10:59 +03:00
Dmitry Stogov bee695fe3d Merge branch 'PHP-7.1'
* PHP-7.1:
  Use full path
2016-11-16 23:09:31 +03:00
Dmitry Stogov cd3527baee Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Use full path
2016-11-16 23:09:13 +03:00
Nuno Lopes 7032ed37c0 fix gcov coverage 2016-11-16 15:08:42 -05:00
Nuno Lopes 5e5e071214 fix gcov coverage 2016-11-16 15:07:16 -05:00
Dmitry Stogov 8e350a627a Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Use full path
2016-11-16 23:05:00 +03:00
Dmitry Stogov 8202b97077 Use full path 2016-11-16 23:01:40 +03:00
Dmitry Stogov f62d876e56 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed type ingference
2016-11-16 20:49:20 +03:00
Dmitry Stogov a04d9e0f1b Fixed type ingference 2016-11-16 20:49:00 +03:00
Adam Baratz 5719553ed2 Fix test for pdo_pgsql 2016-11-16 10:50:14 -05:00
Dmitry Stogov bf17a4f09d Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed ZTS build
2016-11-16 16:47:35 +03:00
Dmitry Stogov 1f3a5b4501 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed ZTS build
2016-11-16 16:47:22 +03:00
Dmitry Stogov 99e5d6c4a5 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
2016-11-16 16:47:05 +03:00
Dmitry Stogov a91f3d475e Fixed ZTS build 2016-11-16 16:43:57 +03:00
Christoph M. Becker 07ed7b5198 Merge branch 'PHP-7.1' 2016-11-16 12:08:16 +01:00
Christoph M. Becker c5abb87322 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-16 12:02:29 +01:00
Christoph M. Becker 936cafe33e Merge branch 'PHP-5.6' into PHP-7.0 2016-11-16 12:00:39 +01:00
Christoph M. Becker eb570294a2 Fix #73530: Unsetting result set may reset other result set
Calling sqlite3_reset() when a result set object is freed can cause
undesired and maybe even hard to track interference with other result
sets. Furthermore, there is no need to call sqlite3_reset(), because
that is implicitly called on SQLite3Stmt::execute(), and users are
encouraged to explicitly call either SQLite3Result::finalize() or
SQLite3Stmt::reset() anyway.
2016-11-16 11:49:04 +01:00
Anatol Belski 1114a337a5 Merge branch 'PHP-7.1'
* PHP-7.1:
  keep ABI
2016-11-16 11:23:16 +01:00
Anatol Belski 5eeec01bae keep ABI 2016-11-16 11:21:32 +01:00
Dmitry Stogov bffbff7dd0 Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
  Fixed bug #73512 Fails to find firebird headers
2016-11-16 12:59:28 +03:00
Dmitry Stogov 65287253fd Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #73512 Fails to find firebird headers
2016-11-16 12:59:16 +03:00
Dmitry Stogov 35e7927736 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #69090 (check cached files permissions)
2016-11-16 12:58:30 +03:00
Dmitry Stogov 86460af56c Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #69090 (check cached files permissions)
2016-11-16 12:56:15 +03:00
Dmitry Stogov a1a5b52f3b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #69090 (check cached files permissions)
2016-11-16 12:49:50 +03:00
Remi Collet 548cbcc929 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #73512 Fails to find firebird headers
2016-11-16 10:47:18 +01:00
Remi Collet 397bedcc7c Fixed bug #73512 Fails to find firebird headers
- use fb_config output instead of relying on hardoded path
2016-11-16 10:47:02 +01:00
Dmitry Stogov ecba563f2f Fixed bug #69090 (check cached files permissions) 2016-11-16 12:43:10 +03:00
Xinchen Hui 5ae5ab83fd Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
  new entry for #2196
  Improve error message
  Fix test
  Refactor and cleanup implementation.
  Revert "Fix Bug #73461"
  Revert "Protect class based session save handler"
  Protect class based session save handler
  Fix Bug #73461
2016-11-16 15:14:33 +08:00
Xinchen Hui 395dc82212 Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
  news entry for #2196
  new entry for #2196
  Improve error message
  Fix test
  Refactor and cleanup implementation.
  Revert "Fix Bug #73461"
  Revert "Protect class based session save handler"
  Protect class based session save handler
  Fix Bug #73461
2016-11-16 15:13:00 +08:00
Xinchen Hui 3a8a99e662 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #73532 (Null pointer dereference in mb_eregi)
2016-11-16 15:05:22 +08:00
Xinchen Hui 229024c725 Fixed bug #73532 (Null pointer dereference in mb_eregi) 2016-11-16 15:05:04 +08:00
Joe Watkins 1b06d82af5 Merge branch 'PHP-7.1'
* PHP-7.1:
  new entry for #2196
  Improve error message
  Fix test
  Refactor and cleanup implementation.
  Revert "Fix Bug #73461"
  Revert "Protect class based session save handler"
  Protect class based session save handler
  Fix Bug #73461
2016-11-16 05:13:13 +00:00
Yasuo Ohgaki d990c54c83 Improve error message 2016-11-16 05:08:29 +00:00
Yasuo Ohgaki 3b45716e40 Fix test 2016-11-16 05:08:29 +00:00
Yasuo Ohgaki 3d6e922367 Refactor and cleanup implementation. 2016-11-16 05:08:29 +00:00
Yasuo Ohgaki 7b29c3fba6 Revert "Fix Bug #73461"
This reverts commit 0383de1467.
2016-11-16 05:08:29 +00:00
Yasuo Ohgaki 186ff85588 Revert "Protect class based session save handler"
This reverts commit d1be861aee.
2016-11-16 05:08:29 +00:00