php-src/ext/standard/tests
Dmitry Stogov 4c716e8b51 Merge branch 'master' into test
* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c
2014-08-11 11:38:41 +04:00
..
array Merge branch 'master' into phpng 2014-08-04 13:56:27 +04:00
assert Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
class_object Fixed tests 2013-12-02 11:53:35 +04:00
dir All tests passed in ext/standard/tests/dir now 2014-03-09 20:10:02 +08:00
directory
file Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
filters
general_functions refcount in phpng has different meanings 2014-07-01 11:54:16 +08:00
http Merge branch 'PHP-5.5' into PHP-5.6 2014-06-12 18:17:18 -07:00
image Fix bug #67250 (iptcparse out-of-bounds read) 2014-05-11 19:09:19 -07:00
mail Merge branch 'PHP-5.4' into PHP-5.5 2014-02-28 22:30:21 +08:00
math Fixed skip case for intdiv 64-bit test 2014-08-06 16:02:02 +01:00
misc
network Merge branch 'httponly-cookies' of https://github.com/mj/php-src 2014-06-12 10:03:14 +01:00
password Really fix leaks, add test cases to prove it... 2012-10-06 10:38:41 -04:00
serialize remove bug67072_2 test for 5.6+ since we'd have cleaner solution 2014-06-24 11:24:07 -07:00
streams Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
strings Merge branch 'master' into phpng 2014-07-14 11:44:53 +04:00
time Fix failed test with recent glibc 2013-11-13 13:19:10 +01:00
url add a test case previously broken by a bad fix 2014-04-24 23:58:38 -07:00
versioning
bug49244.phpt
bug64370_var1.phpt Backported patch for #64370 2013-03-15 19:04:40 +01:00
bug64370_var2.phpt Backported patch for #64370 2013-03-15 19:04:40 +01:00
php_ini_loaded_file.phpt