archived-php-src

mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00

Files

T

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

libmagic

Merge branch 'master' into test

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

tests

Fix bug #67705 (extensive backtracking in rule regular expression)

2014-08-04 00:09:15 -07:00

config.m4

Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute

2014-04-15 10:26:49 -07:00

config.w32

Backported the fix for bug #63248 from 5.4+