Changeset 3810 for trunk/gsdl/src/w32server/httpreq.h

Timestamp:

2003-03-09T09:08:58+13:00 (21 years ago)

Author:

sjboddie

Message:

Removed some hard string length limits in local library server code

File:

• trunk/gsdl/src/w32server/httpreq.h (modified) (3 diffs)

trunk/gsdl/src/w32server/httpreq.h

@@ -29 +29 @@
 #define HTTPREQ_H
 
+// need this to avoid bizarre compiler problems under VC++ 6.0
+#if !defined (GSDL_NAMESPACE_BROKEN) && !defined (GSDL_USE_IOS_H)
+# include <iostream>
+# include <fstream>
+using namespace std;
+#endif
+
 #include "locate.h"
 #include "text_t.h"
@@ -50 +57 @@
 
 //Length constants for RequestFieldsT
-#define ReqMethodStrLen           24
-#define ReqVersionStrLen          24
-#define ReqDateStrLen             48
-#define ReqMIMEVerStrLen          24
-#define ReqPragmaStrLen          128
-#define ReqAuthorizationStrLen   512
-#define ReqFromStrLen            128
-#define ReqIfModSinceStrLen       48
-#define ReqRefererStrLen         512
-#define ReqUserAgentStrLen       256
-#define ReqContentEncodingStrLen 128
-#define ReqContentTypeStrLen     128
-#define ReqContentLengthStrLen    48
-#define ReqAcceptStrLen          256
-#define ReqAcceptLangStrLen       48
-#define ReqConnectionStrLen       24
 #define ReqAuthorizedUserStrLen   48
 #define ReqPathInfoStrLen        512
@@ -74 +65 @@
 
 struct RequestHeaderT {
-  char *Var;
-  char *Val;
+  text_t Var;
+  text_t Val;
 };
 
 struct RequestFieldsT {
   //Simple request line info v0.9
-  char MethodStr[ReqMethodStrLen];
+  text_t MethodStr;
   text_t URIStr;
   //added v1.0
-  char VersionStr[ReqVersionStrLen];
+  text_t VersionStr;
   //General Header
-  char DateStr[ReqDateStrLen];
-  char MIMEVerStr[ReqMIMEVerStrLen];
-  char PragmaStr[ReqPragmaStrLen];
+  text_t DateStr;
+  text_t MIMEVerStr;
+  text_t PragmaStr;
   //Request Header
-  char AuthorizationStr[ReqAuthorizationStrLen];
-  char FromStr[ReqFromStrLen];
-  char IfModSinceStr[ReqIfModSinceStrLen];
-  char RefererStr[ReqRefererStrLen];
-  char UserAgentStr[ReqUserAgentStrLen];
+  text_t AuthorizationStr;
+  text_t FromStr;
+  text_t IfModSinceStr;
+  text_t RefererStr;
+  text_t UserAgentStr;
   //Entity Header (Only CGI stuff)
-  char ContentEncodingStr[ReqContentEncodingStrLen];
-  char ContentTypeStr[ReqContentTypeStrLen];
-  char ContentLengthStr[ReqContentLengthStrLen];
+  text_t ContentEncodingStr;
+  text_t ContentTypeStr;
+  text_t ContentLengthStr;
   //v1.0 Optional (the more common ones)
-  char AcceptStr[ReqAcceptStrLen];
-  char AcceptLangStr[ReqAcceptLangStrLen];
+  text_t AcceptStr;
+  text_t AcceptLangStr;
   //v1.1 Exentions
-  char ConnectionStr[ReqConnectionStrLen];
+  text_t ConnectionStr;
   //Pointer to buffer containing the content
   DWORD ContentLength;