Changeset 16110

Timestamp:

2008-06-23T17:13:17+12:00 (16 years ago)

Author:

ak19

Message:

Avoids use of dummy first Part in Multipart POST message by going back to testing ENV{QUERY_STRING} for containing upload-collection-file command, but this time we read only if this test has failed.

File:

• greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm (modified) (1 diff)

greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm

@@ -17 +17 @@
     my $self;
     if ((defined $ENV{'REQUEST_METHOD'}) && ($ENV{'REQUEST_METHOD'} eq "POST")) {
-    my $line = <STDIN>;
-    # Multipart POST requests' boundaries created by Java's POST method on the client-GLI side 
-    # start with --. If there are other kinds of languages and boundaries we will be dealing
-    # with, we can list those patterns alongside here in the (), separated by |:
-    my $multipartPostBoundary = q/^(--)/; 
-
-    # cmd=upload-collection-file is not read into $line from STDIN, only the boundary (a 
-    # sequence of chars preceeded by --) is encountered. Either we can match on POST requests 
-    # whose cmds contain "download" OR we can look for $line NOT being boundary, to process $line.
-    # Multipart POST messages are processed by the zero-argument CGI constructor.
-    if ((defined $line) && ($line ne "") && ($line !~ /$multipartPostBoundary/)) { 
-        $self = new CGI($line);
+
+    # 1st check if we're dealing with the upload-coll-file cmd. Because it will be a 
+    # multipart POST message and must be dealt with by the default CGI() constructor
+    if((defined $ENV{'QUERY_STRING'}) && ($ENV{'QUERY_STRING'} =~ /upload-collection-file/)) {
+        $self = new CGI(); 
     }
-    else {
-        $self = new CGI();
-    }
+ 
+    else { # all other POST commands processed using CGI($line)
+        my $line = <STDIN>;
+        if ((defined $line) && ($line ne "")) { 
+        $self = new CGI($line);
+        }
+    }   
     }    
-    else {
+
+    # If one of the conditions above did not hold, then self=new CGI() 
+    if(!defined $self) {
     $self = new CGI();
     }