CVS update: php3/functions
| From: | steinm | Date: | Tue, 29 Jun 1999 14:39:33 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-7809@lists.php.net to get a copy of this message | ||
Date: Tuesday June 29, 1999 @ 10:39
Author: steinm
Update of /repository/php3/functions
In directory php:/tmp/cvs-serv19877/functions
Modified Files:
hg_comm.c hw.c
Log Message:
- replaced env variable HOST by HOSTNAME in hyperwave module.
only affects cgi version.
Index: php3/functions/hg_comm.c
diff -u php3/functions/hg_comm.c:1.23 php3/functions/hg_comm.c:1.24
--- php3/functions/hg_comm.c:1.23 Thu Jun 10 05:25:01 1999
+++ php3/functions/hg_comm.c Tue Jun 29 10:39:33 1999
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hg_comm.c,v 1.23 1999/06/10 09:25:01 steinm Exp $ */
+/* $Id: hg_comm.c,v 1.24 1999/06/29 14:39:33 steinm Exp $ */
/* #define HW_DEBUG */
@@ -3997,11 +3997,11 @@
if((hostptr = gethostbyname(host)) == NULL) {
php3_error(E_WARNING, "gethostbyname failed for %s", host);
HWSOCK_FCLOSE(fd);
- return(-1);
+ return(-2);
}
} else {
HWSOCK_FCLOSE(fd);
- return(-1);
+ return(-2);
}
switch(hostptr->h_addrtype) {
@@ -4014,14 +4014,14 @@
break;
default:
HWSOCK_FCLOSE(fd);
- return(-1);
+ return(-3);
break;
}
/* Bottom half of send_getobject */
if(0 > bh_send_getobject(sockfd, objectID)) {
HWSOCK_FCLOSE(fd);
- return -1;
+ return -4;
}
/* Upper half of send_getobject */
@@ -4035,7 +4035,7 @@
if ( (msg.buf = (char *)emalloc(length-HEADER_LENGTH)) == NULL ) {
lowerror = LE_MALLOC;
- return(-1);
+ return(-5);
}
tmp = build_msg_int(msg.buf, objectID);
@@ -4047,7 +4047,7 @@
if(attributes) efree(attributes);
efree(msg.buf);
HWSOCK_FCLOSE(fd);
- return(-1);
+ return(-6);
}
efree(msg.buf);
@@ -4056,7 +4056,7 @@
if ( retmsg == NULL ) {
if(attributes) efree(attributes);
HWSOCK_FCLOSE(fd);
- return(-1);
+ return(-7);
}
ptr = (int *) retmsg->buf;
@@ -4080,7 +4080,7 @@
/* php3_printf("client: can't open data connection to server\n"); */
if(attributes) efree(attributes);
HWSOCK_FCLOSE(fd);
- return(-1);
+ return(-8);
} else {
HWSOCK_FCLOSE(fd);
}
Index: php3/functions/hw.c
diff -u php3/functions/hw.c:1.39 php3/functions/hw.c:1.40
--- php3/functions/hw.c:1.39 Thu Jun 10 05:25:01 1999
+++ php3/functions/hw.c Tue Jun 29 10:39:33 1999
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hw.c,v 1.39 1999/06/10 09:25:01 steinm Exp $ */
+/* $Id: hw.c,v 1.40 1999/06/29 14:39:33 steinm Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
@@ -2113,7 +2113,7 @@
#if APACHE
serv->server_hostname,
#else
- getenv("HOST"),
+ getenv("HOSTNAME"),
#endif
id, mode, rootid, &attributes, &bodytag, &object, &count)))
RETURN_FALSE;
@@ -2180,7 +2180,7 @@
#if APACHE
serv->server_hostname,
#else
- getenv("HOST"),
+ getenv("HOSTNAME"),
#endif
id, cgi_env_str, &attributes, &object, &count)))
RETURN_FALSE;
@@ -2237,7 +2237,7 @@
#if APACHE
serv->server_hostname,
#else
- getenv("HOST"),
+ getenv("HOSTNAME"),
#endif
id, docptr->attributes, docptr->data, docptr->size, &objid))) {
RETURN_FALSE;