archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6'

Browse source 
* 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
This commit is contained in:
Stanislav Malyshev 2015-01-31 21:50:08 -08:00
commit 141b14454c
7 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/php_network.h
View file

@ -319,6 +319,10 @@ END_EXTERN_C()
/* }}} */
#ifndef MAXFQDNLEN
#define MAXFQDNLEN 255
#endif
#endif /* _PHP_NETWORK_H */
/*