CVS update: php3
| From: | sas | Date: | Thu, 21 Jan 1999 21:20:23 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-3675@lists.php.net to get a copy of this message | ||
Date: Thursday January 21, 1999 @ 16:20
Author: sas
Update of /repository/php3
In directory asf:/u/temp/cvs-serv4465
Modified Files:
debugger.c fopen-wrappers.c
Log Message:
Using inet_addr() is deprecated. And even if it's used, it should
compare with INADDR_NONE, not with -1.
Index: php3/debugger.c
diff -c php3/debugger.c:1.65 php3/debugger.c:1.66
*** php3/debugger.c:1.65 Fri Jan 1 12:58:49 1999
--- php3/debugger.c Thu Jan 21 16:20:22 1999
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: debugger.c,v 1.65 1999/01/01 17:58:49 zeev Exp $ */
#if THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: debugger.c,v 1.66 1999/01/21 21:20:22 sas Exp $ */
#if THREAD_SAFE
#include "tls.h"
#endif
***************
*** 68,74 ****
#include "php3_debugger.h"
#include "functions/fsock.h"
! extern int lookup_hostname(const char *addr);
int _php3_send_error(char *message, char *address);
#ifndef THREAD_SAFE
--- 68,74 ----
#include "php3_debugger.h"
#include "functions/fsock.h"
! extern int lookup_hostname(const char *addr, struct in_addr *in);
int _php3_send_error(char *message, char *address);
#ifndef THREAD_SAFE
Index: php3/fopen-wrappers.c
diff -c php3/fopen-wrappers.c:1.54 php3/fopen-wrappers.c:1.55
*** php3/fopen-wrappers.c:1.54 Fri Jan 1 12:58:49 1999
--- php3/fopen-wrappers.c Thu Jan 21 16:20:22 1999
***************
*** 27,33 ****
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.54 1999/01/01 17:58:49 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 27,33 ----
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.55 1999/01/21 21:20:22 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 466,475 ****
free_url(resource);
return NULL;
}
- server.sin_addr.s_addr = lookup_hostname(resource->host);
server.sin_family = AF_INET;
! if (server.sin_addr.s_addr == -1) {
SOCK_FCLOSE(*socketd);
*socketd = 0;
free_url(resource);
--- 466,474 ----
free_url(resource);
return NULL;
}
server.sin_family = AF_INET;
! if (lookup_hostname(resource->host, &server.sin_addr)) {
SOCK_FCLOSE(*socketd);
*socketd = 0;
free_url(resource);
***************
*** 632,641 ****
free_url(resource);
return NULL;
}
- server.sin_addr.s_addr = lookup_hostname(resource->host);
server.sin_family = AF_INET;
! if (server.sin_addr.s_addr == -1) {
SOCK_FCLOSE(*socketd);
*socketd = 0;
free_url(resource);
--- 631,639 ----
free_url(resource);
return NULL;
}
server.sin_family = AF_INET;
! if (lookup_hostname(resource->host, &server.sin_addr)) {
SOCK_FCLOSE(*socketd);
*socketd = 0;
free_url(resource);
***************
*** 845,854 ****
free_url(resource);
return NULL;
}
- server.sin_addr.s_addr = lookup_hostname(resource->host);
server.sin_family = AF_INET;
! if (server.sin_addr.s_addr == -1) {
free_url(resource);
SOCK_FCLOSE(*socketd);
*socketd = 0;
--- 843,851 ----
free_url(resource);
return NULL;
}
server.sin_family = AF_INET;
! if (lookup_hostname(resource->host, &server.sin_addr)) {
free_url(resource);
SOCK_FCLOSE(*socketd);
*socketd = 0;
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net