cvs: php4 / configure.in /main network.c php_network.h

wez Tue Oct 29 09:57:13 2002 EDT Modified files: /php4 configure.in /php4/main network.c php_network.h Log: Fix for #19508 by poleson@verio.net. Index: php4/configure.in diff -u php4/configure.in:1.392 php4/configure.in:1.393 --- php4/configure.in:1.392 Sun Oct 27 21:13:43 2002 +++ php4/configure.in Tue Oct 29 09:57:12 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.392 2002/10/28 02:13:43 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.393 2002/10/29 14:57:12 wez Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -408,6 +408,15 @@ if test "$ac_cv_sockaddr_storage" = yes; then AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,[Whether you have struct sockaddr_storage]) fi + +dnl Check if sockaddr data structure includes an "sa_len" member +AC_CHECK_MEMBER([struct sockaddr.sa_len], + [AC_DEFINE(HAVE_SOCKADDR_LEN,1,[Whether sockaddr struct has sa_len])], + [], +[ +#include <sys/types.h> +#include <sys/socket.h> +]) dnl Check for IPv6 support AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, Index: php4/main/network.c diff -u php4/main/network.c:1.82 php4/main/network.c:1.83 --- php4/main/network.c:1.82 Sat Oct 19 13:05:08 2002 +++ php4/main/network.c Tue Oct 29 09:57:12 2002 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.82 2002/10/19 17:05:08 iliaa Exp $ */ +/* $Id: network.c,v 1.83 2002/10/29 14:57:12 wez Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -504,7 +504,7 @@ struct sockaddr_in *sin = (struct sockaddr_in *) addr; sin->sin_family = AF_INET; sin->sin_port = htons(port); - sin->sin_addr.s_addr = INADDR_ANY; + sin->sin_addr.s_addr = htonl(INADDR_ANY); break; } } Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.36 php4/main/php_network.h:1.37 --- php4/main/php_network.h:1.36 Mon Oct 14 12:14:18 2002 +++ php4/main/php_network.h Tue Oct 29 09:57:12 2002 @@ -15,7 +15,7 @@ | Author: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: php_network.h,v 1.36 2002/10/14 16:14:18 sebastian Exp $ */ +/* $Id: php_network.h,v 1.37 2002/10/29 14:57:12 wez Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -98,8 +98,13 @@ typedef struct sockaddr_storage php_sockaddr_storage; #else typedef struct { +#ifdef HAVE_SOCKADDR_LEN + unsigned char ss_len; + unsigned char ss_family; +#else unsigned short ss_family; - char info[256]; +#endif + char info[126]; } php_sockaddr_storage; #endif