Attachment 311568 Details for Bug 425879 – patch which adds desired feature

[patch] patch which adds desired feature

lynx-2.8.6-ipv6arg.patch (text/plain), 2.20 KB, created by Jiri Moskovcak on 2008-07-11 12:45:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Moskovcak

Created: 2008-07-11 12:45:14 UTC

Size: 2.20 KB

patch

obsolete

>--- lynx2-8-6/src/LYUtils.c	2006-11-07 02:27:15.000000000 +0100
>+++ lynx2-8-6mzk/src/LYUtils.c	2008-07-11 14:13:40.000000000 +0200
>@@ -2207,9 +2207,9 @@ UrlTypes is_url(char *filename)
> 	return (result);
> 
>     /*
>-     * Can't be a URL if it lacks a colon.
>+     * Can't be a URL if it lacks a colon and if it starts with '[' it's probably ipv6.
>      */
>-    if (NULL == strchr(cp, ':'))
>+    if (NULL == strchr(cp, ':') || cp[0] == '[')
> 	return (result);
> 
>     /*
>@@ -4463,7 +4463,7 @@ BOOLEAN LYExpandHostForURL(char **Alloca
>     const char *StartP, *EndP;
>     char *DomainSuffix = NULL;
>     const char *StartS, *EndS;
>-    char *Str = NULL, *StrColon = NULL, *MsgStr = NULL;
>+    char *Str = NULL, *StrColon = NULL, *MsgStr = NULL, *StrSqPar1 = NULL, *StrSqPar2 = NULL;
>     char *Host = NULL, *HostColon = NULL, *host = NULL;
>     char *Path = NULL;
>     char *Fragment = NULL;
>@@ -4516,13 +4516,23 @@ BOOLEAN LYExpandHostForURL(char **Alloca
>      * and trim it off, but save the information so we can restore the port
>      * field after filling in the host field.  - FM
>      */
>-    if ((StrColon = strrchr(Str, ':')) != NULL &&
>-	isdigit(UCH(StrColon[1]))) {
>+    StrColon = strrchr(Str, ':');
>+    StrSqPar2 = strrchr(Str, ']');
>+    if ((StrColon > StrSqPar2) && isdigit(UCH(StrColon[1]))) {
> 	if (StrColon == Str) {
> 	    goto cleanup;
> 	}
> 	*StrColon = '\0';
>     }
>+    if (StrSqPar2 != NULL){
>+            if( (StrSqPar1 = strchr(Str, '[')) != NULL){
>+                char *tmp;
>+                *StrSqPar2 = '\0'; //cut the ']'
>+                tmp = strdup(++StrSqPar1);
>+                FREE(Str);
>+                Str = tmp;
>+            }
>+        }
> 
>     /*
>      * Do a DNS test on the potential host field as presently trimmed.  - FM
>--- lynx2-8-6/WWW/Library/Implementation/HTParse.c	2005-10-17 02:17:20.000000000 +0200
>+++ lynx2-8-6mzk/WWW/Library/Implementation/HTParse.c	2008-07-11 14:18:58.000000000 +0200
>@@ -358,7 +358,8 @@ char *HTParse(const char *aName,
> 		    /*
> 		     * Colon not followed by a port number.
> 		     */
>-		    *p2 = '\0';
>+             if(strchr(result,'[') == NULL)
>+                 *p2 = '\0';
> 		if (p2 != NULL && *p2 != '\0' && acc_method != NULL) {
> 		    /*
> 		     * Port specified.

Actions: View | Diff

Attachments on bug 425879: 311568 | 405011