cvs: php4 /sapi/isapi php4isapi.c
| From: | Zeev Suraski | Date: | Wed, 09 Aug 2000 16:45:40 +0000 |
| Subject: | cvs: php4 /sapi/isapi php4isapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1114@lists.php.net to get a copy of this message | ||
zeev Wed Aug 9 09:45:40 2000 EDT
Modified files:
/php4/sapi/isapi php4isapi.c
Log:
Fix a couple of bugs in the ISAPI module:
- I think NTLM should work now
- Fix the DOCUMENT_ROOT code
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.49 php4/sapi/isapi/php4isapi.c:1.50
--- php4/sapi/isapi/php4isapi.c:1.49 Mon Aug 7 04:51:21 2000
+++ php4/sapi/isapi/php4isapi.c Wed Aug 9 09:45:40 2000
@@ -380,14 +380,15 @@
#ifdef PHP_WIN32
{
HSE_URL_MAPEX_INFO humi;
- DWORD plen = 1;
+ DWORD path_len = 2;
+ char path[] = "/";
- if (lpECB->ServerSupportFunction(lpECB->ConnID, HSE_REQ_MAP_URL_TO_PATH_EX, "/",
&plen, (LPDWORD) &humi)) {
- /* Remove trailing \ */
- if(humi.lpszPath[strlen(humi.lpszPath) - 1] == '\\') {
- humi.lpszPath[strlen(humi.lpszPath) - 1] = '\0';
- }
- php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array ELS_CC
PLS_CC);
+ if (lpECB->ServerSupportFunction(lpECB->ConnID, HSE_REQ_MAP_URL_TO_PATH_EX, path,
&path_len, (LPDWORD) &humi)) {
+ /* Remove trailing \ */
+ if (humi.lpszPath[path_len-2] == '\\') {
+ humi.lpszPath[path_len-2] = 0;
+ }
+ php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array ELS_CC PLS_CC);
}
}
#endif
@@ -461,8 +462,6 @@
if (auth_password && auth_password[0]) {
SG(request_info).auth_password = estrdup(auth_password);
}
- auth_user[0] = 0;
- auth_password[0] = 0;
return SF_STATUS_REQ_HANDLED_NOTIFICATION;
}
break;