[w3m-dev 02608]

From: From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

3 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 2129fe6..af858ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-04  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 02608]
+	* local.c (localcgi_get): request == NULL means no ? in URL
+	* url.c (openURL): ditto
+
 2001-12-03  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 02606]
diff --git a/local.c b/local.c
index e4d7278..1c94cf8 100644
--- a/local.c
+++ b/local.c
@@ -1,4 +1,4 @@
-/* $Id: local.c,v 1.11 2001/12/02 16:26:08 ukai Exp $ */
+/* $Id: local.c,v 1.12 2001/12/03 18:15:12 ukai Exp $ */
 #include "fm.h"
 #include <string.h>
 #include <stdio.h>
@@ -460,7 +460,7 @@ localcgi_get(char *uri, char *request, char *referer)
 	return NULL;
     else if (pid)
 	return f;
-    if (!strcmp(request, "")) {
+    if (request == NULL) {
 	set_cgi_environ(Strnew_charp(uri)->ptr, file, Strnew_charp(uri)->ptr);
     }
     else {
@@ -470,7 +470,7 @@ localcgi_get(char *uri, char *request, char *referer)
     if (referer && referer != NO_REFERER)
 	set_environ("HTTP_REFERER", referer);
     set_environ("REQUEST_METHOD", "GET");
-    set_environ("QUERY_STRING", request);
+    set_environ("QUERY_STRING", request ? request : "");
     freopen(DEV_NULL_PATH, "r", stdin);
 #ifdef HAVE_CHDIR		/* ifndef __EMX__? */
     chdir(mydirname(file));
diff --git a/url.c b/url.c
index 6bb0cbd..a5654e2 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.17 2001/12/02 16:26:08 ukai Exp $ */
+/* $Id: url.c,v 1.18 2001/12/03 18:15:12 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -1433,7 +1433,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
 	else if ((i = strlen(pu->file)) > extlen &&
 		 !strncmp(pu->file + i - extlen, CGI_EXTENSION, extlen)) {
 	    /* lodal CGI: GET */
-	    uf.stream = newFileStream(localcgi_get(pu->real_file, "",
+	    uf.stream = newFileStream(localcgi_get(pu->real_file, NULL,
 						   option->referer),
 				      (void (*)())pclose);
 	    if (uf.stream == NULL)