Changeset 2286 for trunk/gsdl/src/w32server/wincgiutils.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/wincgiutils.cpp (modified) (4 diffs)

trunk/gsdl/src/w32server/wincgiutils.cpp

@@ +1 @@
+/**********************************************************************
+ *
+ * wincgiutils.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 <windows.h>
 #include <string.h>
 #include "netio.h"
 #include "httpreq.h"
-// #include "locate.h"
 #include "wincgiutils.h"
 
-
-#define url_limit 256
-#define file_limit 102400   /*should be large enough for a header line*/
 #define default_http_port 80
 
+// Attempt to break a url into segments. If the parsing fails, 'name' is
+// left pointing to the unparsed portion.
+int parse_url(const text_t &url, text_t &protocol, text_t &machine, 
+          int *port, text_t &name) {
 
-int parse_url(char *url,
-          char **protocol, char **machine, int *port, char **name)
-/* Attempt to break a url into segments.  If the parsing
-   fails, 'name' is left pointing to the unparsed portion.
-   This routine may extend the url string by one character */
-{
-  char next, thiss;
-  *protocol = *machine = "";
+  protocol.clear();
+  machine.clear();
   *port = default_http_port;
+  name.clear();
   
-  *name = url;       /* In case there is no protocol */
-  while (*url != ':' && *url != 0) url++;
-  if (*url == 0) return http_error_url_invalid;
-  url++;
-  if (*url != '/') return http_error_url_invalid;
-  *url++ = 0;
-  if (*url != '/') return http_error_url_invalid;
-  url++;
-  
-  *protocol = *name;
-  *machine = url;
-  while (*url != ':' && *url != '/' && *url != 0) url++;
-  if (*url == ':') {
-    *url = 0;
-    url++; *port = 0;
-    while (*url >= '0' && *url <= '9')
-      *port = *port * 10 + (*url++ - '0');
+  text_t::const_iterator begin = url.begin();
+  text_t::const_iterator end = url.end();
+  text_t::const_iterator it = findchar(begin, end, ':');
+  if (it == end) {name = url; return http_error_url_invalid;}
+  if (substr(it+1, it+3) != "//") {name = url; return http_error_url_invalid;}
+  protocol = substr(begin, it);
+  it += 3;
+  while (it < end) {
+    if (*it == ':') {
+      it++;
+      text_t portstr;
+      while (it != end && (*it >= '0' && *it <= '9')) {
+    portstr.push_back(*it);
+    it++;
+      }
+      *port = portstr.getint();
+      if (it == end) break;
     }
-  if (*url == '/') {
-    *url++ = 0;
-    next = '/';
-    *name = url;
-    while (*url != 0) {
-      thiss = *url;  *url++ = next;  next = thiss; }
-    *url++ = next;
-    *url = 0;
+
+    if (*it == '/') {
+      while (it != end) {
+    name.push_back(*it);
+    it++;
+      }
+      break;
     }
-  else if (*url == 0) {
-    url++;
-    *name = url;
-    *url++ = '/';
-    *url = 0;
-    }
-  else {
-    *name = url;
-    return http_error_url_invalid;
+
+    machine.push_back(*it);
+    it ++;
   }
   return http_ok;
 }
-
-
-
 
 int Send_String(char *str, RequestInfoT *RInfo)
@@ -80 +92 @@
 {
   char Header[1536];  int len, lenc;
-    //Build Header
-    Header[0] = 0;
-    //Status Line
-    if (content[0] != '@')          /*No redirection needed*/
-      strcat(Header, "HTTP/1.0 200 OK\r\n");
-    else                            /*Redirection*/
-      strcat(Header, "HTTP/1.0 302 Relocation\r\n");
-    //Server
-    strcat(Header, "Server: GSDL\r\n");
-    //Content Type
-    strcat(Header, "Content-type: ");
-    if (content[0] != '@')          /*No redirection needed*/
-      strcat(Header, content);
-    else {                          /*Redirection entry*/
-      strcat(Header, "text/html \r\n");
-      strcat(Header, "Location: ");
-      len = strlen(Header);
-      lenc = strlen(content) - 1;
-      strncpy(&Header[len], &content[1], lenc);
-      Header[len+lenc] = 0;
-      }
-    strcat(Header, " \r\n");
-    //Single CRLF to end header
-    strcat(Header, "\r\n");
-
-   return Send_String(Header, RequestInfo);
+  //Build Header
+  Header[0] = 0;
+  //Status Line
+  if (content[0] != '@')          /*No redirection needed*/
+    strcat(Header, "HTTP/1.0 200 OK\r\n");
+  else                            /*Redirection*/
+    strcat(Header, "HTTP/1.0 302 Relocation\r\n");
+  //Server
+  strcat(Header, "Server: GSDL\r\n");
+  //Content Type
+  strcat(Header, "Content-type: ");
+  if (content[0] != '@')          /*No redirection needed*/
+    strcat(Header, content);
+  else {                          /*Redirection entry*/
+    strcat(Header, "text/html \r\n");
+    strcat(Header, "Location: ");
+    len = strlen(Header);
+    lenc = strlen(content) - 1;
+    strncpy(&Header[len], &content[1], lenc);
+    Header[len+lenc] = 0;
+  }
+  strcat(Header, " \r\n");
+  //Single CRLF to end header
+  strcat(Header, "\r\n");
+  
+  return Send_String(Header, RequestInfo);
 }
 
@@ -112 +124 @@
   char Header[512], Body[512], ErrorNumStr[17], BodyLengthStr[17];
   DWORD BodyLength; int HeaderLength;
-
+  
   itoa(error_num, ErrorNumStr, 10);
-
+  
   //Build Data (so we can determine length for the header)
   Body[0] = 0;
@@ -149 +161 @@
    //Send the file if we have one (and if it's not a HEAD request)
   SendData(RequestInfo->ClientSocket, (BYTE *) Header, strlen(Header), RequestInfo->ThreadNum);
-//   if ((FileFound == FALSE) && (strcmpi(RequestFields.MethodStr, "HEAD") != 0)) {
-    //Send generated data
+  //   if ((FileFound == FALSE) && (strcmpi(RequestFields.MethodStr, "HEAD") != 0)) {
+  //Send generated data
   SendData(RequestInfo->ClientSocket, (BYTE *) Body, BodyLength, RequestInfo->ThreadNum);
-
 }
-