Commit Graph

100680 Commits

Author SHA1 Message Date
Anatol Belski
c8038d0611 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix proto
2016-12-19 00:53:17 +01:00
Anatol Belski
680b813380 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-19 00:52:01 +01:00
Anatol Belski
88c1491c6d fix proto 2016-12-19 00:50:29 +01:00
Anatol Belski
781632ba24 Merge branch 'PHP-7.1'
* PHP-7.1:
  Cursor is not opened on singleton selects.
  fix arg spec and datatype, follow up on 73594
2016-12-18 21:56:56 +01:00
Anatol Belski
f077ada348 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Cursor is not opened on singleton selects.
  fix arg spec and datatype, follow up on 73594
2016-12-18 21:55:30 +01:00
Dorin Marcoci
cf46ac1179 Cursor is not opened on singleton selects.
Test case for unregistered bug on FB3 singleton selects

Set error mode to warning instead of exception.
2016-12-18 21:53:51 +01:00
Anatol Belski
3e48baa49d fix arg spec and datatype, follow up on 73594 2016-12-18 21:16:35 +01:00
Anatol Belski
4015768718 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #73594
2016-12-18 20:54:27 +01:00
Anatol Belski
7371c46518 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73594
2016-12-18 20:47:02 +01:00
Bruce Weirdan
c78fd4568e Fixed bug #73594
Skip the tests when local resolver does not behave

* Added SKIPIF sections to check local resolver
* Added test to check $authns parameter
2016-12-18 20:44:33 +01:00
Nikita Popov
ca682952e7 Merge branch 'PHP-7.1' 2016-12-18 17:11:01 +01:00
Nikita Popov
4ef4e34c2e Merge branch 'PHP-7.0' into PHP-7.1 2016-12-18 17:10:54 +01:00
Nikita Popov
c1af9f282f Fix bug #46103 2016-12-18 17:10:19 +01:00
Nikita Popov
5c22579faf Merge branch 'PHP-7.1' 2016-12-18 14:58:49 +01:00
Nikita Popov
7d404bc3d6 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-18 14:58:38 +01:00
Nikita Popov
eb636fcb56 Add test for get_browser() in object mode
All other tests only check array return values...
2016-12-18 13:16:25 +01:00
Anatol Belski
6704edb125 Merge branch 'PHP-7.1'
* PHP-7.1:
  extend UPGRADING
  update NEWS
2016-12-18 01:11:28 +01:00
Anatol Belski
59bf7f907f extend UPGRADING 2016-12-18 01:08:58 +01:00
Anatol Belski
e8512ed7db update NEWS 2016-12-18 01:03:00 +01:00
Anatol Belski
8b7fe6cb8a Merge branch 'PHP-7.1'
* PHP-7.1:
  fix C89 compat
2016-12-17 20:47:05 +01:00
Anatol Belski
f86e077ec8 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix C89 compat
2016-12-17 20:46:09 +01:00
Anatol Belski
58a945cf68 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix C89 compat
2016-12-17 20:45:22 +01:00
Anatol Belski
79e47aae41 fix C89 compat 2016-12-17 20:43:32 +01:00
Anatol Belski
e6ae0e2b41 Merge branch 'PHP-7.1'
* PHP-7.1:
  replace default appveyor build version
2016-12-17 13:15:32 +01:00
Anatol Belski
a9e0705b64 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  replace default appveyor build version
2016-12-17 13:14:12 +01:00
Anatol Belski
0cd1c18853 replace default appveyor build version 2016-12-17 13:12:34 +01:00
Xinchen Hui
adf0256c4a Merge branch 'PHP-7.1'
* PHP-7.1:
  Reorder the oplines
2016-12-17 20:09:49 +08:00
Xinchen Hui
aa84808e33 Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
  add Appveyor fast_fail
  improve error check
  turn mcrypt back on for Appveyor runs
  add build status badge
  add scripts for AppVeyor integration
  Silence warning from unhandled enum
  fix leaking streams and memory mapped files
  turn mcrypt back on for Appveyor runs
  add build status badge
  add scripts for AppVeyor integration
  Silence warning from unhandled enum
  fix leaking streams and memory mapped files
  Fix stack management in ini scanner
  chance CLI codepage, only when SAPI is initialized
2016-12-17 20:09:34 +08:00
Xinchen Hui
a12f43ee2c Reorder the oplines
1. we should only do the return type checking when it is really about to
return
2. for 029.php, actually, the exception threw should be discard while it
jmp into finally(it could be observed by change the return to return an array)
3. after this fix, the test 029.phpt behavior consistently with 7.0
4. good for optimizer too
2016-12-17 20:06:18 +08:00
Anatol Belski
2c313aea6f Merge branch 'PHP-7.1'
* PHP-7.1:
  add Appveyor fast_fail
  improve error check
2016-12-17 11:27:51 +01:00
Anatol Belski
a3a8cc686a Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  add Appveyor fast_fail
  improve error check
2016-12-17 11:27:17 +01:00
Anatol Belski
9afb05dcd1 add Appveyor fast_fail 2016-12-17 11:26:13 +01:00
Anatol Belski
158d11d53d improve error check 2016-12-17 11:25:06 +01:00
Anatol Belski
8a3d5e5899 Merge branch 'PHP-7.1'
* PHP-7.1:
  turn mcrypt back on for Appveyor runs
  add build status badge
  add scripts for AppVeyor integration
  Silence warning from unhandled enum
  fix leaking streams and memory mapped files
2016-12-17 00:16:01 +01:00
Anatol Belski
c104f09d88 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  turn mcrypt back on for Appveyor runs
  add build status badge
  add scripts for AppVeyor integration
  Silence warning from unhandled enum
  fix leaking streams and memory mapped files
2016-12-17 00:14:50 +01:00
Anatol Belski
53c4c38878 turn mcrypt back on for Appveyor runs
(cherry picked from commit fca2312fbe)
2016-12-17 00:13:16 +01:00
Anatol Belski
576ed049c5 add build status badge
(cherry picked from commit 3a886c9d20)
2016-12-17 00:13:01 +01:00
Anatol Belski
aeebae641e add scripts for AppVeyor integration
(cherry picked from commit c737d6fb49)
2016-12-17 00:12:49 +01:00
Sara Golemon
5004ae2b62 Silence warning from unhandled enum
(cherry picked from commit 57bbe2c140)
2016-12-17 00:12:33 +01:00
Anatol Belski
2f9e928af8 fix leaking streams and memory mapped files
(cherry picked from commit f1ff23095b)
2016-12-17 00:12:19 +01:00
Anatol Belski
5d7eb0a7a2 Merge branch 'PHP-7.1'
* PHP-7.1:
  turn mcrypt back on for Appveyor runs
  add build status badge
  add scripts for AppVeyor integration
  Silence warning from unhandled enum
  fix leaking streams and memory mapped files
2016-12-16 23:01:48 +01:00
Anatol Belski
fca2312fbe turn mcrypt back on for Appveyor runs 2016-12-16 22:59:47 +01:00
Anatol Belski
4377546d2f add build status badge
(cherry picked from commit 3a886c9d20)
2016-12-16 22:56:23 +01:00
Anatol Belski
4a69f450ff add scripts for AppVeyor integration
(cherry picked from commit c737d6fb49)
2016-12-16 22:56:08 +01:00
Sara Golemon
587f1b2427 Silence warning from unhandled enum
(cherry picked from commit 57bbe2c140)
2016-12-16 22:55:13 +01:00
Anatol Belski
9cdf64c225 fix leaking streams and memory mapped files
(cherry picked from commit f1ff23095b)
2016-12-16 22:55:02 +01:00
Nikita Popov
edf3cde0d3 Merge branch 'PHP-7.1' 2016-12-16 20:56:09 +01:00
Nikita Popov
a32829f909 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-16 20:55:08 +01:00
Nikita Popov
fa92a16e46 Fix stack management in ini scanner 2016-12-16 20:54:46 +01:00
Anatol Belski
376b73d1d6 Merge branch 'PHP-7.1'
* PHP-7.1:
  chance CLI codepage, only when SAPI is initialized
2016-12-16 17:10:36 +01:00