php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,168 Commits 549 Branches 1,485 Tags
dfd776b32656e573bea6141d63df6f05a396e69f
Commit Graph

99168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski dfd776b326 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  enforce the test ini usage for the child process
 2016-12-04 14:02:37 +01:00
Anatol Belski 10a2ceef3b enforce the test ini usage for the child process 2016-12-04 14:01:40 +01:00
Yasuo Ohgaki e34c8281fa Merge branch 'pull-request/2228' into PHP-7.1 
* pull-request/2228:
  Fix session upgrade documentation
 2016-12-04 17:48:55 +09:00
Tobias Schultze e15733f0b8 Fix session upgrade documentation 2016-12-04 07:33:29 +01:00
Bob Weinand ca871aaba6 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-03 23:44:23 +01:00
Bob Weinand 46d708a1b6 Fix PHP-7.0 build (wrong fix for the branch) 2016-12-03 23:39:54 +01:00
Bob Weinand 146b68e022 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-03 18:28:47 +01:00
Bob Weinand ffc1ef1eed Fix leak when using $this outside of object context 2016-12-03 18:28:08 +01:00
Christoph M. Becker c20299ddc4 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-03 14:18:56 +01:00
Christoph M. Becker a8ec79e27f Merge branch 'PHP-5.6' into PHP-7.0 2016-12-03 14:18:00 +01:00
Adrien Crivelli cf2496140d Fix minor typo 2016-12-03 14:15:52 +01:00
Yasuo Ohgaki 0b204d60a4 Fix typo in php.ini-* comment 2016-12-03 14:23:05 +09:00
Nikita Popov 91d365f805 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-02 17:03:59 +01:00
Nikita Popov 8f7325fc24 Fix leak in shift_right_function 2016-12-02 17:03:05 +01:00
Bob Weinand 7b5e89de82 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-02 15:42:19 +01:00
Bob Weinand 3c1a0d75bf Fix test of wrong operator in self_xor.phpt 2016-12-02 15:41:47 +01:00
Dmitry Stogov af2d47c9c7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Eliminated useless exception check
 2016-12-02 15:40:04 +03:00
Dmitry Stogov 68558ab71d Eliminated useless exception check 2016-12-02 15:39:33 +03:00
Dmitry Stogov b3a4de65cd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
 2016-12-02 15:14:37 +03:00
Dmitry Stogov 2b70d44b57 Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion). 2016-12-02 15:13:55 +03:00
Dmitry Stogov 5a57b3d6e0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed behavior of failing compound assignments (they shouldn't change the source value).
 2016-12-02 14:00:29 +03:00
Dmitry Stogov dbf39cddd9 Fixed behavior of failing compound assignments (they shouldn't change the source value). 2016-12-02 13:58:44 +03:00
Davey Shafik 2f5090168f Bump versions and NEWS for 7.1.1-dev 2016-12-02 02:24:54 -08:00
Dmitry Stogov 04500f1fe0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed possible memory leak in &=, |=, ^=.
 2016-12-02 12:35:44 +03:00
Dmitry Stogov 67d90a4870 Fixed possible memory leak in &=, |=, ^=. 2016-12-02 12:34:46 +03:00
Bob Weinand ad5038bfee Merge branch 'PHP-7.0' into PHP-7.1 2016-12-01 15:21:49 +01:00
Bob Weinand fcaccbaa22 Fix valgrind issue when throwing due to yield from aborted generator 2016-12-01 15:21:28 +01:00
Anatol Belski 1c2333009f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fork tests
 2016-12-01 14:53:22 +01:00
Anatol Belski 2252d4e59d fork tests 2016-12-01 14:52:18 +01:00
Dmitry Stogov 96655ad01e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bad merge
 2016-12-01 16:22:23 +03:00
Dmitry Stogov 7f22e3c879 Fixed bad merge 2016-12-01 16:21:57 +03:00
Dmitry Stogov d149ba217f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:50:19 +03:00
Dmitry Stogov b7b7dd8cea Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:50:05 +03:00
Dmitry Stogov 1cd566e13f Workaround for GCC-4.9.2 bug 2016-12-01 15:46:52 +03:00
Anatol Belski 9c7540d357 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve skipif
 2016-12-01 13:33:42 +01:00
Anatol Belski 615c9bfe5a fix condition 2016-12-01 13:33:27 +01:00
Anatol Belski 043d8e2fe1 improve skipif 2016-12-01 13:32:10 +01:00
Anatol Belski 8ecbb660d0 improve skipif 2016-12-01 13:25:28 +01:00
Dmitry Stogov 54244ba565 Fixed access to uninitialized value 2016-12-01 13:25:50 +03:00
Dmitry Stogov 54f7abfe7d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Simpler overflow check
  fix gcov coverage
 2016-12-01 10:34:09 +03:00
Dmitry Stogov 003346c450 Simpler overflow check 2016-12-01 10:30:02 +03:00
Anatol Belski 60c875b072 fix dir separator 2016-12-01 01:36:29 +01:00
Davey Shafik db456d91f4 Update NEWS for the build 2016-11-30 15:14:38 -08:00
Nuno Lopes d5a2af6d1c Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 2016-11-30 14:41:26 -05:00
Bob Weinand e37412e19c Merge branch 'PHP-7.0' into PHP-7.1 2016-11-30 11:45:18 +01:00
Bob Weinand 344ef050aa Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available 2016-11-30 11:44:10 +01:00
Bob Weinand 7aaa1a876e Merge branch 'PHP-7.0' into PHP-7.1 2016-11-30 02:57:16 +01:00
Bob Weinand b73a3afff3 Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup) 2016-11-30 02:56:47 +01:00
Dmitry Stogov cabcf8971f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
 2016-11-28 12:57:02 +03:00
Dmitry Stogov 9a9ad56af0 Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on). 2016-11-28 12:54:47 +03:00