CVS update: php3/functions

Date: Thursday September 3, 1998 @ 11:50 Author: steinm Update of /repository/php3/functions In directory asf:/u2/tmp/cvs-serv24178/functions Modified Files: hw.c Log Message: bugfixes Index: php3/functions/hw.c diff -c php3/functions/hw.c:1.6 php3/functions/hw.c:1.7 *** php3/functions/hw.c:1.6 Fri Aug 28 07:15:13 1998 --- php3/functions/hw.c Thu Sep 3 11:50:16 1998 *************** *** 23,29 **** +----------------------------------------------------------------------+ */ ! /* $Id: hw.c,v 1.6 1998/08/28 11:15:13 steinm Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif --- 23,29 ---- +----------------------------------------------------------------------+ */ ! /* $Id: hw.c,v 1.7 1998/09/03 15:50:16 steinm Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif *************** *** 1642,1648 **** --- 1642,1650 ---- int rootid = 0; hw_connection *ptr; hw_document *doc; + #if APACHE server_rec *serv = GLOBAL(php3_rqst)->server; + #endif TLS_VARS; argc = ARG_COUNT(ht); *************** *** 1680,1686 **** char *bodytag = NULL; int count; /* !!!! memory for object, bodytag and attributes is allocated with malloc !!!! */ ! if (0 != (ptr->lasterror = send_pipedocument(ptr->socket, serv->server_hostname, id, mode, rootid, &attributes, &bodytag, &object, &count))) RETURN_FALSE; doc = malloc(sizeof(hw_document)); --- 1682,1694 ---- char *bodytag = NULL; int count; /* !!!! memory for object, bodytag and attributes is allocated with malloc !!!! */ ! if (0 != (ptr->lasterror = send_pipedocument(ptr->socket, ! #if APACHE ! serv->server_hostname, ! #else ! "localhost", ! #endif ! id, mode, rootid, &attributes, &bodytag, &object, &count))) RETURN_FALSE; doc = malloc(sizeof(hw_document)); *************** *** 1700,1706 **** --- 1708,1716 ---- hw_connection *ptr; hw_document *doc; char cgi_env_str[1000]; + #if APACHE server_rec *serv = GLOBAL(php3_rqst)->server; + #endif TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { *************** *** 1727,1733 **** GLOBAL(request_info).path_info, GLOBAL(request_info).query_string); /* !!!! memory for object, bodytag and attributes is allocated with malloc !!!! */ ! if (0 != (ptr->lasterror = send_pipecgi(ptr->socket, serv->server_hostname, id, cgi_env_str, &attributes, &object, &count))) RETURN_FALSE; doc = malloc(sizeof(hw_document)); --- 1737,1749 ---- GLOBAL(request_info).path_info, GLOBAL(request_info).query_string); /* !!!! memory for object, bodytag and attributes is allocated with malloc !!!! */ ! if (0 != (ptr->lasterror = send_pipecgi(ptr->socket, ! #if APACHE ! serv->server_hostname, ! #else ! "localhost", ! #endif ! id, cgi_env_str, &attributes, &object, &count))) RETURN_FALSE; doc = malloc(sizeof(hw_document)); -- 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