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

..

tests

Merge branch 'master' into test

2014-08-11 11:38:41 +04:00

config0.m4

Fix long-standing visual pain point: the misalignment of './configure help' text.

2013-08-06 11:06:09 -07:00

config.w32

…

CREDITS

* implement new output API, fixing some bugs and implementing some feature

2010-05-31 10:29:43 +00:00

package.xml

…

php_zlib.def

…

php_zlib.h

Bump year

2014-01-03 11:08:10 +08:00

zlib_filter.c

Merge branch 'master' into test

2014-08-11 11:38:41 +04:00

zlib_fopen_wrapper.c

Fixes to various stream cast on win64

2014-03-19 06:33:46 +01:00

zlib_win32_howto.txt

…

zlib.c

Refactor zlib (all tests pass)

2014-05-05 15:52:09 +08:00

zlib.dsp

revert change #298288: Remove old dsp/dsw/makefile files

2010-04-28 14:41:51 +00:00