Re: [evolution-patches] fix for bug #41461

[Not Zed <notzed ximian com>]

I guess this is ok.

Although '.', '?' and ']' could end url's fairly commonly, so we'll
probably end up with another bug eventually saying we got it wrong again
... but it would be hard to fix without a fair extra amount of smarts.

On Thu, 2003-04-17 at 06:26, Jeffrey Stedfast wrote:
> http://bugzilla.ximian.com/show_bug.cgi?id=41461
> 
> 
> 
> -- 
> Jeffrey Stedfast
> Evolution Hacker - Ximian, Inc.
> fejj ximian com  - www.ximian.com
> 
> ______________________________________________________________________
> 
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
> retrieving revision 1.1795
> diff -u -r1.1795 ChangeLog
> --- ChangeLog	16 Apr 2003 17:02:09 -0000	1.1795
> +++ ChangeLog	16 Apr 2003 20:39:06 -0000
> @@ -1,3 +1,18 @@
> +2003-04-16  Jeffrey Stedfast  <fejj ximian com>
> +
> +	* camel-url-scanner.c (camel_url_web_end): Urls are unlikely to
> +	end with punctuation or closing braces, so strip any of those off
> +	the end of the url. Fixes bug #41461.
> +
> +	* tests/mime-filter/data/html.1.out: Removed a trailing \n at the
> +	end of the file, this is incorrect (since out input file does not
> +	contain one).
> +
> +	* camel-mime-filter-tohtml.c (html_convert): Only output a <br> if
> +	we found an eoln in the input. Along the same lines, don't write a
> +	'\n' to the output buffer unless we've encountered that eoln in
> +	the input. Fixes bug #41407.
> +
>  2003-04-15  Jeffrey Stedfast  <fejj ximian com>
>  
>  	* camel-gpg-context.c (gpg_verify): The gpg child process exiting
> Index: camel-url-scanner.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/camel-url-scanner.c,v
> retrieving revision 1.5
> diff -u -r1.5 camel-url-scanner.c
> --- camel-url-scanner.c	9 Mar 2003 17:57:34 -0000	1.5
> +++ camel-url-scanner.c	16 Apr 2003 20:39:06 -0000
> @@ -359,6 +359,13 @@
>  			while (inptr < inend && is_urlsafe (*inptr) && *inptr != close_brace)
>  				inptr++;
>  			
> +			/* urls are extremely unlikely to end with any
> +			 * punctuation, so strip any trailing
> +			 * punctuation off. Also strip off any closing
> +			 * braces. */
> +			while (inptr > pos && strchr (",.?!)}]", inptr[-1]))
> +				inptr--;
> +			
>  			break;
>  		default:
>  			break;