cvs: php4 /ext/standard http_fopen_wrapper.c /main network.c

zeev Sat Jan 13 05:02:19 2001 EDT Modified files: /php4/ext/standard http_fopen_wrapper.c /php4/main network.c Log: Fix Windows & thread-safe build Index: php4/ext/standard/http_fopen_wrapper.c diff -u php4/ext/standard/http_fopen_wrapper.c:1.4 php4/ext/standard/http_fopen_wrapper.c:1.5 --- php4/ext/standard/http_fopen_wrapper.c:1.4 Fri Jan 12 12:49:25 2001 +++ php4/ext/standard/http_fopen_wrapper.c Sat Jan 13 05:02:19 2001 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.4 2001/01/12 20:49:25 venaas Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.5 2001/01/13 13:02:19 zeev Exp $ */ #include "php.h" #include "php_globals.h" @@ -270,9 +270,9 @@ free_url(resource); if (location[0] != '\0') { zval **response_header_new, *entry, **entryp; + ELS_FETCH(); fp = php_fopen_url_wrap_http(location, mode, options, issock, socketd, opened_path); - ELS_FETCH(); if (zend_hash_find(EG(active_symbol_table), "http_response_header", sizeof("http_response_header"), (void **) &response_header_new) == SUCCESS) { entryp = &entry; MAKE_STD_ZVAL(entry); Index: php4/main/network.c diff -u php4/main/network.c:1.11 php4/main/network.c:1.12 --- php4/main/network.c:1.11 Sat Jan 13 03:48:47 2001 +++ php4/main/network.c Sat Jan 13 05:02:19 2001 @@ -15,7 +15,7 @@ | Authors: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.11 2001/01/13 11:48:47 venaas Exp $ */ +/* $Id: network.c,v 1.12 2001/01/13 13:02:19 zeev Exp $ */ #include "php.h" @@ -59,11 +59,13 @@ # define SOCK_CONN_ERR -1 #endif +#ifdef HAVE_GETADDRINFO #ifdef HAVE_GAI_STRERROR # define PHP_GAI_STRERROR(x) (gai_strerror(x)) #else # define PHP_GAI_STRERROR(x) (php_gai_strerror(x)) -static char *php_gai_strerror(int code) { +static char *php_gai_strerror(int code) +{ static struct { int code; const char *msg; @@ -95,6 +97,7 @@ return "Unknown error"; } +#endif #endif static void php_network_freeaddresses(struct sockaddr **sal)