summaryrefslogtreecommitdiff
path: root/www/wwwoffle
diff options
context:
space:
mode:
authoritohy <itohy@pkgsrc.org>1999-11-30 03:53:29 +0000
committeritohy <itohy@pkgsrc.org>1999-11-30 03:53:29 +0000
commitdc68cb1778bc689eece5bc7eb05c440cc89ff12d (patch)
treedb7fc7ecd9b3025dc796c77e96cebe88221a6b89 /www/wwwoffle
parent4809ea04ef1597945bb26f1a418b3a428ef3a430 (diff)
downloadpkgsrc-dc68cb1778bc689eece5bc7eb05c440cc89ff12d.tar.gz
Treat broken URL's like "http://foo.bar:80?query" (no '/' between
port and query part) as "http://foo.bar:80/?query". Patch is from the wwwoffle author via Feico Dillema.
Diffstat (limited to 'www/wwwoffle')
-rw-r--r--www/wwwoffle/files/patch-sum5
-rw-r--r--www/wwwoffle/patches.v6/patch-bc12
-rw-r--r--www/wwwoffle/patches/patch-ab70
3 files changed, 79 insertions, 8 deletions
diff --git a/www/wwwoffle/files/patch-sum b/www/wwwoffle/files/patch-sum
index 9d3cd226bc9..0a57d34eab1 100644
--- a/www/wwwoffle/files/patch-sum
+++ b/www/wwwoffle/files/patch-sum
@@ -1,9 +1,10 @@
-$NetBSD: patch-sum,v 1.4 1999/11/26 06:09:01 itohy Exp $
+$NetBSD: patch-sum,v 1.5 1999/11/30 03:53:29 itohy Exp $
MD5 (patch-aa) = 2f8dab0f46e80bfa5d9a05172354b62d
+MD5 (patch-ab) = 290bc5f165fc2cd7afe5bce775cbf58d
MD5 (patch-ba) = 697b7cad9f1cd82c4b74da1317f4f987
MD5 (patch-bb) = 06fd1d3b05e51f2594d97c4213b897ae
-MD5 (patch-bc) = 1b57de22607a54791e72ad411cc2ba79
+MD5 (patch-bc) = ae6ff7004707b57b4e6e465db9c25e8d
MD5 (patch-bd) = 526ecc28c80aaaf26fd5fc34893a97fa
MD5 (patch-be) = 0a1d40853dc4b1efaff7d96981efad2d
MD5 (patch-bf) = 757112e555a41d0365eaaf85d177dadd
diff --git a/www/wwwoffle/patches.v6/patch-bc b/www/wwwoffle/patches.v6/patch-bc
index 88175deeeac..298bb64aa6c 100644
--- a/www/wwwoffle/patches.v6/patch-bc
+++ b/www/wwwoffle/patches.v6/patch-bc
@@ -1,17 +1,17 @@
-$NetBSD: patch-bc,v 1.3 1999/11/26 06:09:01 itohy Exp $
+$NetBSD: patch-bc,v 1.4 1999/11/30 03:53:30 itohy Exp $
---- misc.c.orig Thu Jul 8 01:37:57 1999
-+++ misc.c Thu Nov 25 20:00:34 1999
+--- misc.c.nov6 Mon Nov 29 11:11:55 1999
++++ misc.c Tue Nov 30 09:07:18 1999
@@ -44,7 +44,7 @@
URL *Url=(URL*)malloc(sizeof(URL));
char *copyurl,*mallocurl=malloc(strlen(url)+2);
int i=0,n=0;
-- char *colon,*slash,*at,*temppath,root[2];
-+ char *colon,*slash,*escr,*at,*temppath,root[2];
+- char *colon,*slash,*at,*ques,*temppath,root[2];
++ char *colon,*slash,*escr,*at,*ques,*temppath,root[2];
copyurl=mallocurl;
strcpy(copyurl,url);
-@@ -174,12 +174,17 @@
+@@ -172,12 +172,17 @@
strcpy(Url->host,copyurl);
}
diff --git a/www/wwwoffle/patches/patch-ab b/www/wwwoffle/patches/patch-ab
new file mode 100644
index 00000000000..afd56942e0e
--- /dev/null
+++ b/www/wwwoffle/patches/patch-ab
@@ -0,0 +1,70 @@
+$NetBSD: patch-ab,v 1.1 1999/11/30 03:53:30 itohy Exp $
+
+This patch is originated from the author, and will be included
+in future releases.
+
+--- misc.c.orig Mon Nov 29 10:50:02 1999
++++ misc.c Mon Nov 29 11:11:55 1999
+@@ -44,7 +44,7 @@
+ URL *Url=(URL*)malloc(sizeof(URL));
+ char *copyurl,*mallocurl=malloc(strlen(url)+2);
+ int i=0,n=0;
+- char *colon,*slash,*at,*temppath,root[2];
++ char *colon,*slash,*at,*ques,*temppath,root[2];
+
+ copyurl=mallocurl;
+ strcpy(copyurl,url);
+@@ -73,7 +73,8 @@
+ slash=strchr(copyurl,'/');
+ }
+ else if(colon && !isdigit(*(colon+1)) &&
+- (!at || (slash && at>slash))) /* http:www.foo.com/... */
++ (!slash || colon<slash) &&
++ (!at || (slash && at>slash))) /* http:www.foo.com/...[:@]... */
+ {
+ *colon=0;
+ Url->proto=(char*)malloc(colon-copyurl+1);
+@@ -127,6 +128,16 @@
+ Url->pass=NULL;
+ }
+
++ /* Arguments */
++ ques=strchr(copyurl,'?');
++ if(ques) /* ../path?... */
++ {
++ *ques++=0;
++ Url->args=(char*)malloc(strlen(ques)+1);
++ strcpy(Url->args,ques);
++ }
++ else
++ Url->args=NULL;
+ /* Hostname */
+
+ if(*copyurl=='/') /* /path/... (local) */
+@@ -139,24 +150,11 @@
+ Url->host=copyurl;
+ Url->local=0;
+
+- if(slash) /* www.foo.com/... */
++ if(slash && (!ques || slash<ques)) /* www.foo.com/...[?]... */
+ copyurl=slash;
+- else /* www.foo.com */
++ else /* www.foo.com[?]... */
+ {root[0]='/';root[1]=0;copyurl=root;}
+ }
+-
+- /* Arguments */
+-
+- Url->args=NULL;
+-
+- for(i=0;copyurl[i];i++)
+- if(copyurl[i]=='?')
+- {
+- copyurl[i]=0;
+- Url->args=(char*)malloc(strlen(copyurl+i+1)+1);
+- strcpy(Url->args,copyurl+i+1);
+- break;
+- }
+
+ /* Pathname */
+