delta/php-git.git/main/php_network.h, branch php-7.0.0RC3

Merge branch 'PHP-5.6'

2015-02-01T05:50:08+00:00

* PHP-5.6:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Conflicts:
	ext/sockets/sockaddr_conv.c
	ext/standard/dns.c

Merge branch 'PHP-5.4' into PHP-5.5

2015-02-01T05:48:14+00:00

* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Use better constant since MAXHOSTNAMELEN may mean shorter name

2015-02-01T05:46:56+00:00

bump year

2015-01-15T15:27:30+00:00

Bump year

2015-01-15T15:26:03+00:00

trailing whitespace removal

2015-01-10T23:07:38+00:00

second shot on removing TSRMLS_*

2014-12-14T13:07:59+00:00

first shot remove TSRMLS_* things

2014-12-13T22:06:14+00:00

s/PHP 5/PHP 7/

2014-09-19T16:33:14+00:00

master renames phase 1

2014-08-25T17:24:55+00:00