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

100505 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
Christoph M. Becker
ced66cd6ca Merge branch 'PHP-7.1' 2016-12-07 13:50:11 +01:00
Christoph M. Becker
00ee42e385 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-07 13:45:18 +01:00
Markus Staab
dd77116fb0 Fixed typo in skipif error message 2016-12-07 13:35:58 +01:00
Dmitry Stogov
000d4a1a1b Merge branch 'PHP-7.1'
* PHP-7.1:
  Check if PHP is in execution state.
2016-12-07 15:13:00 +03:00
Dmitry Stogov
ee15891c35 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Check if PHP is in execution state.
2016-12-07 15:12:48 +03:00
Dmitry Stogov
3c8c347fa7 Check if PHP is in execution state. 2016-12-07 15:12:18 +03:00
Dmitry Stogov
c2bc94f5a5 Fixed memory leaks caused by exceptions thrown from destructors (fixed test). 2016-12-07 14:20:43 +03:00
Dmitry Stogov
5011a11a6d Fixed memory leaks caused by exceptions thrown from destructors (one more case). 2016-12-07 01:43:13 +03:00
Dmitry Stogov
e8109e09aa Fixed memory leaks caused by exceptions thrown from destructors. 2016-12-07 00:41:07 +03: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
ecb718eb7e Merge branch 'PHP-7.1'
* PHP-7.1:
  update NEWS
2016-12-06 20:27:54 +01:00
Anatol Belski
1c5c046d9a Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2016-12-06 20:26:40 +01:00
Anatol Belski
991ca7f7d7 update NEWS 2016-12-06 20:25:27 +01:00
Bob Weinand
b149001ffd Merge branch 'PHP-7.1' 2016-12-06 18:30:50 +01:00
Bob Weinand
43f88f25bb Merge branch 'PHP-7.0' into PHP-7.1 2016-12-06 18:30:37 +01:00
Bob Weinand
7e12b5da71 Fixed issue getting executable lines from custom wrappers
See also krakjoe/phpdbg#161
2016-12-06 18:29:48 +01:00
Anatol Belski
c42f603195 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak, take 2
2016-12-06 16:20:14 +01:00
Anatol Belski
308cc2e9d4 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix leak, take 2
2016-12-06 16:18:54 +01:00
Anatol Belski
fee5c049a8 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix leak, take 2
2016-12-06 16:17:28 +01:00
Anatol Belski
c89306ac52 fix leak, take 2 2016-12-06 16:12:39 +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
Anatol Belski
b9a138dbc8 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak, take on 5.6
2016-12-06 14:39:00 +01:00
Anatol Belski
8f4c006ada Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix leak, take on 5.6
2016-12-06 14:37:58 +01:00
Anatol Belski
f2fc812b78 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix leak, take on 5.6
2016-12-06 14:36:52 +01:00
Anatol Belski
b04d60626d fix leak, take on 5.6 2016-12-06 14:34:27 +01:00
Xinchen Hui
1113d589dc Merge branch 'PHP-7.1'
* PHP-7.1:
  Update NEWS
  Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
2016-12-06 17:33:27 +08:00
Xinchen Hui
72891f385b Update NEWS 2016-12-06 17:33:15 +08:00
Xinchen Hui
d7a759916d Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
2016-12-06 17:32:48 +08:00
Xinchen Hui
358bd77b23 Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list()) 2016-12-06 17:32:32 +08:00
Dmitry Stogov
b4ad6d6d1b COALESCE can't throw exception 2016-12-06 10:21:44 +03:00
Dmitry Stogov
a722970033 Merge branch 'PHP-7.1'
* PHP-7.1:
  Micro optimizations
2016-12-06 10:01:38 +03:00
Dmitry Stogov
547b735d34 Micro optimizations 2016-12-06 10:01:18 +03: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