1
0
mirror of https://github.com/php/php-src.git synced 2026-03-28 18:22:42 +01:00
Files
archived-php-src/ext/zlib/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
..
2004-05-19 08:45:46 +00:00
2006-06-26 23:35:22 +00:00
2010-03-12 10:28:59 +00:00
2012-09-03 13:37:34 +02:00
2012-09-03 13:37:34 +02:00
2012-03-27 18:16:02 +02:00
2013-06-17 01:06:20 -07:00
2012-04-24 20:35:49 +02:00
2012-04-24 19:50:00 +02:00
2014-08-05 15:44:43 +02:00
2014-08-05 15:44:43 +02:00
2010-01-19 12:42:50 +00:00
2007-06-18 10:02:12 +00:00
2011-09-08 10:14:38 +00:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2013-06-10 13:36:17 -07:00
2011-08-31 04:24:48 +00:00
2011-08-31 04:24:48 +00:00
2011-08-31 04:24:48 +00:00