1
0
mirror of https://github.com/php/php-src.git synced 2026-03-31 04:32:19 +02:00
Commit Graph

43532 Commits

Author SHA1 Message Date
Xinchen Hui
4faa540b45 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 uninitialized member
2016-12-09 11:41:26 +08:00
Xinchen Hui
68bdd6d018 Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references) 2016-12-09 11:41:08 +08:00
Anatol Belski
d46972b6ae Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix uninitialized member
2016-12-08 17:16:48 +01:00
Anatol Belski
66ad7918b8 fix uninitialized member 2016-12-08 17:15:06 +01:00
Xinchen Hui
8250b3fca1 Fixed possible false assertion failure 2016-12-08 22:04:43 +08:00
Anatol Belski
394a3593cc Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  git clean section
2016-12-08 03:24:59 +01:00
Anatol Belski
ff6565462e git clean section 2016-12-08 03:24:18 +01:00
Nikita Popov
60249f4390 Fix propagation of QM_ASSIGN into VERIFY_RETURN_TYPE
VERIFY_RETURN_TYPE uses different formats for the CONST/non-CONST
cases. If we progate a CONST operand into op1, op1 should be
moved to result.
2016-12-07 23:14:46 +01:00
Adam Baratz
5a20d83be8 Remove noop param hook 2016-12-07 17:09:09 -05:00
Adam Baratz
e133a2dd78 Clean up tabs and whitespace 2016-12-07 17:08:51 -05:00
Anatol Belski
67b7c5055c Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
2016-12-07 21:07:14 +01:00
Dorin Marcoci
13ffa88e1f Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement 2016-12-07 21:06:11 +01:00
Johannes Schlüter
54f526be89 Install ext/json headers 2016-12-07 17:50:05 +01:00
Anatol Belski
5b3e36fe78 fix test compat with MySQL 5.7 2016-12-07 16:04:47 +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
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
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
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
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
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
3b79f8f408 Fix bug #73654 2016-12-05 20:41:14 +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
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
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
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
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
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
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