ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/corbaservices/uk/org/iscream/cms/corbaservices/MiniWebServer.java
(Generate patch)

Comparing projects/cms/source/corbaservices/uk/org/iscream/cms/corbaservices/MiniWebServer.java (file contents):
Revision 1.3 by tdb, Mon Feb 26 22:41:15 2001 UTC vs.
Revision 1.7 by tdb, Fri Apr 5 11:54:35 2002 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.corbaservices;
2 > package uk.org.iscream.cms.corbaservices;
3  
4   //---IMPORTS---
5   import java.net.*;
# Line 98 | Line 98 | public class MiniWebServer extends Thread {
98                  String data = "";
99                  BufferedReader reader = new BufferedReader(new FileReader(file));
100                  while(reader.ready()) {
101 <                    data += reader.readLine();
102 <                    data += "\n";
101 >                    String line = reader.readLine();
102 >                    if(line != null) {
103 >                        data += line + "\n";
104 >                    }
105                  }
106                  return data;
107              }
# Line 230 | Line 232 | public class MiniWebServer extends Thread {
232                  do {
233                      line = reader.readLine();
234                      // ah, this contains the URL
235 <                    if(line.startsWith("GET")) {
235 >                    if(line.startsWith("GET ")) {
236                          // strip off "GET "
237                          url = line.substring(4);
238                          // strip off anything past the URL
239 <                        url = url.substring(0, url.lastIndexOf(' '));
239 >                        if(url.lastIndexOf(' ') != -1) {
240 >                            url = url.substring(0, url.lastIndexOf(' '));
241 >                        }
242                      }
243                  } while(!line.equals(""));
244                  // check the URL is allowed

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines