Changeset 2286 for trunk/gsdl/src/w32server/httpreq.cpp

Timestamp:

2001-04-05T17:08:52+12:00 (23 years ago)

Author:

sjboddie

Message:

Had a bit of a tidy up in the fnord webserver code. The main change of note
was the removal of our reliance on the MAX_URL_SIZE constant. URLs and post
data of any length should now work.

File:

• trunk/gsdl/src/w32server/httpreq.cpp (modified) (5 diffs)

trunk/gsdl/src/w32server/httpreq.cpp

@@ -1 @@
-/*
-Copyright (C) 1996
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-The author can be contacted via Email at [email protected]
-*/
+/**********************************************************************
+ *
+ * httpreq.cpp
+ * Copyright (C) 1996
+ * 
+ * A component of the fnord webserver written by [email protected].
+ *
+ * Altered for use with the Greenstone digital library software by the
+ * New Zealand Digital Library Project at the University of Waikato,
+ * New Zealand.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *********************************************************************/
+
 #include "text_t.h"
 #include <windows.h>
@@ -303 +311 @@
       if (RequestFields.AcceptStr[0] == '\0') {
         strncpy(RequestFields.AcceptStr, FieldValStr, ReqAcceptStrLen - 1);
-    //          if (Len >= ReqAcceptStrLen)
-    //        if (log_debug) log_message("Accept field truncated");
       }
       else {
@@ -317 +323 @@
     else if (strcmp("DATE:", FieldNameStr) == 0) {
       strncpy(RequestFields.DateStr, FieldValStr, ReqDateStrLen - 1);
-      //            if (Len >= ReqDateStrLen) LogError("Date field truncated");
     }
     else if (strcmp("USER-AGENT:", FieldNameStr) == 0) {
       strncpy(RequestFields.UserAgentStr, FieldValStr, ReqUserAgentStrLen - 1);
-      //            if (Len >= ReqUserAgentStrLen) {
-      //            LogError("User Agent field truncated, value follows");
-      //            LogError(RequestFields.UserAgentStr);
-      //            }
     }
     else if (strcmp("CONNECTION:", FieldNameStr) == 0) {
       strncpy(RequestFields.ConnectionStr, FieldValStr, ReqConnectionStrLen - 1);
-      //            if (Len >= ReqConnectionStrLen) LogError("Connection field truncated");
     }
     //--Sometimes--
     else if (strcmp("ACCEPT-LANGUAGE:", FieldNameStr) == 0) {
       strncpy(RequestFields.AcceptLangStr, FieldValStr, ReqAcceptLangStrLen - 1);
-      //            if (Len >= ReqAcceptLangStrLen) LogError("Accept-Language field truncated");
     }
     else if (strcmp("REFERER:", FieldNameStr) == 0) {
       strncpy(RequestFields.RefererStr, FieldValStr, ReqRefererStrLen - 1);
-      //            if (Len >= ReqRefererStrLen) LogError("Referer field truncated");
     }
     else if (strcmp("IF-MODIFIED-SINCE:", FieldNameStr) == 0) {
       strncpy(RequestFields.IfModSinceStr, FieldValStr, ReqIfModSinceStrLen - 1);
-      //            if (Len >= ReqIfModSinceStrLen) LogError("If Modified Since field truncated");
     }
     //--Uncommon--
     else if (strcmp("FROM:", FieldNameStr) == 0) {
       strncpy(RequestFields.FromStr, FieldValStr, ReqFromStrLen - 1);
-      //            if (Len >= ReqFromStrLen) LogError("From field truncated");
     }
     else if (strcmp("MIME-VERSION:", FieldNameStr) == 0) {
       strncpy(RequestFields.MIMEVerStr, FieldValStr, ReqMIMEVerStrLen - 1);
-      //            if (Len >= ReqMIMEVerStrLen) LogError("MIME Version field truncated");
     }
     else if (strcmp("PRAGMA:", FieldNameStr) == 0) {
       strncpy(RequestFields.PragmaStr, FieldValStr, ReqPragmaStrLen - 1);
-      //            if (Len >= ReqPragmaStrLen) LogError("Pragma field truncated");
     }
     //--Special case--
     else if (strcmp("AUTHORIZATION:", FieldNameStr) == 0) {
       strncpy(RequestFields.AuthorizationStr, FieldValStr, ReqAuthorizationStrLen - 1);
-      //            if (Len >= ReqAuthorizationStrLen) LogError("Authorization field truncated");
     }
     else if (strcmp("CONTENT-LENGTH:", FieldNameStr) == 0) {
       strncpy(RequestFields.ContentLengthStr, FieldValStr, ReqContentLengthStrLen - 1);
-      //            if (Len >= ReqContentLengthStrLen) LogError("Content Length field truncated");
     }
     else if (strcmp("CONTENT-TYPE:", FieldNameStr) == 0) {
       strncpy(RequestFields.ContentTypeStr, FieldValStr, ReqContentTypeStrLen - 1);
-      //            if (Len >= ReqContentTypeStrLen) LogError("Content Type field truncated");
     }
     else if (strcmp("CONTENT-ENCODING:", FieldNameStr) == 0) {
       strncpy(RequestFields.ContentEncodingStr, FieldValStr, ReqContentEncodingStrLen - 1);
-      //            if (Len >= ReqContentEncodingStrLen) LogError("Content Encoding field truncated");
     }
     else {
@@ -390 +380 @@
   }
   
-  
   if (RequestFields.ContentLengthStr[0] != 0) { //Do we have attached data?
     unsigned int NumRecv;
@@ -396 +385 @@
     RequestFields.ContentLength = atol(RequestFields.ContentLengthStr);
     if (RequestFields.ContentLength > 0) {
-      //            ThreadDebugMessage(RequestInfo.ThreadNum, "Getting content");
       
       //Allocate memory