From: Anatol Belski <ab@php.net>
Date: Mon, 1 Dec 2014 07:32:12 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49de5b7aed4bed9ebbb4bc085d240084b090ad7b;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  add include for missing usleep proto
  C89 compat
  Added more useful warning messages
  Changed based on comments and make its behaviour equal to the Windows version
  Fix #53092 - dns_get_record does not return false on dns server failure
  Fix php cli (-S option) inconsistent port parsing

Conflicts:
	main/streams/plain_wrapper.c
---

49de5b7aed4bed9ebbb4bc085d240084b090ad7b