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
100,505 Commits 549 Branches 1,485 Tags
ffb1773bcbbbdf43118092fcff73039cfacafe74
Commit Graph

44295 Commits

Author SHA1 Message Date
Anatol Belski ffb1773bcb Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test compat with MySQL 5.7
 2016-12-07 16:05:43 +01:00
Anatol Belski 5b3e36fe78 fix test compat with MySQL 5.7 2016-12-07 16:04:47 +01:00
Nikita Popov 6c614cb14c Merge branch 'PHP-7.1' 2016-12-06 22:26:36 +01:00
Nikita Popov 76c4a3db08 Fix bug #73668 
Not bothering to implement special handling to get an accurate
range for this case.
 2016-12-06 22:25:35 +01:00
Nikita Popov 89f8a34483 Merge branch 'PHP-7.1' 2016-12-06 22:12:01 +01:00
Nikita Popov d7e7f74b24 Factor out common binary op code in range inference 
Instead of repeating the same code for binary ops and their
compound assignment variants, factor the range computation out
into a separate function.
 2016-12-06 22:09:44 +01:00
Anatol Belski 8c403ecd99 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix leak, take on 7.x
 2016-12-06 14:46:15 +01:00
Anatol Belski 4e3f728701 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix leak, take on 7.x
 2016-12-06 14:44:04 +01:00
Anatol Belski 9b1430140a fix leak, take on 7.x 2016-12-06 14:42:59 +01:00
Stanislav Malyshev fe084168d0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
 2016-12-05 22:33:47 -08:00
Stanislav Malyshev 28fc49a53f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
 2016-12-05 22:33:42 -08:00
Stanislav Malyshev 183b4d78aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
 2016-12-05 22:33:33 -08:00
Stanislav Malyshev d7ce944cf1 This still leaks memory, I don't have enough knowledge in WDDX code to fix them :( 2016-12-05 22:32:59 -08:00
Stanislav Malyshev 65a0c3ee36 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73645 - int/size_t confusion
 2016-12-05 22:16:48 -08:00
Stanislav Malyshev 619a691c7c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73645 - int/size_t confusion
 2016-12-05 22:16:42 -08:00
Stanislav Malyshev 1d59ed7524 Fix bug #73645 - int/size_t confusion 2016-12-05 22:16:00 -08:00
Stanislav Malyshev 5b18436dc6 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73631 - Invalid read when wddx decodes empty boolean element
 2016-12-05 21:59:17 -08:00
Stanislav Malyshev 4ae4ca45aa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73631 - Invalid read when wddx decodes empty boolean element
 2016-12-05 21:59:10 -08:00
Stanislav Malyshev 6292fe84d3 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #73631 - Invalid read when wddx decodes empty boolean element
 2016-12-05 21:58:55 -08:00
Stanislav Malyshev 266ecb6d0a Fix bug #73631 - Invalid read when wddx decodes empty boolean element 2016-12-05 21:40:55 -08:00
Nikita Popov 795cd6d3a7 Merge branch 'PHP-7.1' 2016-12-05 20:41:21 +01:00
Nikita Popov 3b79f8f408 Fix bug #73654 2016-12-05 20:41:14 +01:00
Anatol Belski 35cfec1f9f Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
 2016-12-04 22:46:23 +01:00
Anatol Belski 8ad9043aa3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
 2016-12-04 22:45:31 +01:00
Anatol Belski eddca73ad2 fix test 
This test depends on connection flags modifable from teh env,
that can affect the exact function called.
 2016-12-04 22:42:39 +01:00
Anatol Belski 4fe117589c Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
 2016-12-04 22:29:33 +01:00
Anatol Belski b6f5fcfc3a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
 2016-12-04 22:28:34 +01:00
Anatol Belski 1eb3f01c68 fix test 
On Windows, either doubled backslashes or forward slashes are supported
on the server side.
 2016-12-04 22:27:17 +01:00
Anatol Belski 89c61768f7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix ident
 2016-12-04 21:00:34 +01:00
Anatol Belski 69c3859368 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix ident
 2016-12-04 20:59:56 +01:00
Anatol Belski 69fbc751ff fix ident 2016-12-04 20:59:12 +01:00
Anatol Belski cefa9e6743 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
 2016-12-04 17:30:03 +01:00
Anatol Belski 2198ce2f28 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
 2016-12-04 17:29:22 +01:00
Anatol Belski 8e209d0435 fix test 2016-12-04 17:28:43 +01:00
Anatol Belski e72f6f0b65 Merge branch 'PHP-7.1' 
* PHP-7.1:
  enforce the test ini usage for the child process
  Fix session upgrade documentation
 2016-12-04 14:03:17 +01:00
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
Dmitry Stogov 9c1920d9e8 Revert "Fix memory leaks with FE_RESET upon empty iterator" 
This reverts commit 00e516e575.
 2016-12-02 11:58:36 +03:00
Anatol Belski a263ca6af0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fork tests
 2016-12-01 14:54:21 +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 0a22c59c2b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bad merge
 2016-12-01 16:22:32 +03: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 78bc8b0f33 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:51:16 +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
Anatol Belski 127cdd44af Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix condition
  improve skipif
 2016-12-01 13:34:20 +01: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