CVS update: php31/sapi

Date: Wednesday September 16, 1998 @ 15:15 Author: shane Update of /repository/php31/sapi In directory asf:/u2/tmp/cvs-serv20230/sapi Modified Files: apache_sapi.c isapi_sapi.c Log Message: fix cfg_get functions. I know they'll be changing eventualy, might as well have it work now though. apache works again. Index: php31/sapi/apache_sapi.c diff -c php31/sapi/apache_sapi.c:2.17 php31/sapi/apache_sapi.c:2.18 *** php31/sapi/apache_sapi.c:2.17 Thu Sep 10 20:22:57 1998 --- php31/sapi/apache_sapi.c Wed Sep 16 15:15:25 1998 *************** *** 75,81 **** { char *ptr; SAPI_FUNC_VARS ! ptr = table_get(php3_rqst->subprocess_env, string); if (!ptr) ptr = getenv(string); return ptr; --- 75,81 ---- { char *ptr; SAPI_FUNC_VARS ! ptr = (char *)table_get(php3_rqst->subprocess_env, string); if (!ptr) ptr = getenv(string); return ptr; *************** *** 149,155 **** else rr = r + 1; if (GLOBAL(php3_ini)->safe_mode && (!strcasecmp(header, "WWW-authenticate"))) { ! myuid = _php3_getuid(); sprintf(temp2, "realm=\"%ld ", myuid); /* SAFE */ temp = _php3_regreplace("realm=\"", temp2, rr, 1, 0); if (!strcmp(temp, rr)) { --- 149,155 ---- else rr = r + 1; if (GLOBAL(php3_ini)->safe_mode && (!strcasecmp(header, "WWW-authenticate"))) { ! myuid = (long)_php3_getuid(); sprintf(temp2, "realm=\"%ld ", myuid); /* SAFE */ temp = _php3_regreplace("realm=\"", temp2, rr, 1, 0); if (!strcmp(temp, rr)) { *************** *** 491,503 **** sapi_info->filename = NULL; /* we will estrdup rqst_filename later */ sapi_info->request_method = php3_rqst->method; sapi_info->query_string = php3_rqst->args; ! sapi_info->content_type = table_get(php3_rqst->subprocess_env, "CONTENT_TYPE"); ! buf = table_get(php3_rqst->subprocess_env, "CONTENT_LENGTH"); sapi_info->content_length = (buf ? atoi(buf) : 0); ! sapi_info->cookies = table_get(php3_rqst->subprocess_env, "HTTP_COOKIE"); ! sapi_info->authorization = table_get(php3_rqst->headers_in, "Authorization"); sapi_info->getenv = sapi_getenv; sapi_info->writeclient = sapi_writeclient; --- 491,505 ---- sapi_info->filename = NULL; /* we will estrdup rqst_filename later */ sapi_info->request_method = php3_rqst->method; sapi_info->query_string = php3_rqst->args; ! sapi_info->content_type = (char *)table_get(php3_rqst->subprocess_env, "CONTENT_TYPE"); ! buf = (char *)table_get(php3_rqst->subprocess_env, "CONTENT_LENGTH"); sapi_info->content_length = (buf ? atoi(buf) : 0); ! sapi_info->cookies = (char *)table_get(php3_rqst->subprocess_env, "HTTP_COOKIE"); ! sapi_info->authorization = (char *)table_get(php3_rqst->headers_in, "Authorization"); ! sapi_info->server_name = (char *)table_get(php3_rqst->subprocess_env, "SERVER_NAME"); ! sapi_info->script_name = (char *)table_get(php3_rqst->subprocess_env, "SCRIPT_NAME"); sapi_info->getenv = sapi_getenv; sapi_info->writeclient = sapi_writeclient; Index: php31/sapi/isapi_sapi.c diff -c php31/sapi/isapi_sapi.c:2.22 php31/sapi/isapi_sapi.c:2.23 *** php31/sapi/isapi_sapi.c:2.22 Thu Sep 3 03:11:23 1998 --- php31/sapi/isapi_sapi.c Wed Sep 16 15:15:25 1998 *************** *** 529,536 **** if (!*user->pszUser) break; /* we have to get the iis user/pw we want to authenticate to */ ! cfg_get_string("iis_username", &iis_user); ! cfg_get_string("iis_userpw", &iis_userpw); #if DEBUG snprintf(logmessage, 256, "%d:HttpFilterProc:User: %s Pword: %s NTUser: %s NTPw: %s\n", GetCurrentThreadId(), --- 529,536 ---- if (!*user->pszUser) break; /* we have to get the iis user/pw we want to authenticate to */ ! ini_get_string("iis_username", &iis_user); ! ini_get_string("iis_userpw", &iis_userpw); #if DEBUG snprintf(logmessage, 256, "%d:HttpFilterProc:User: %s Pword: %s NTUser: %s NTPw: %s\n", GetCurrentThreadId(), -- 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