Attachment 874797 Details for Bug 1076830 – As described in the Additional info.

[patch] As described in the Additional info.

thttpd-2.25b-svgz.patch (text/plain), 2.67 KB, created by Bob Tennent on 2014-03-15 13:56:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Tennent

Created: 2014-03-15 13:56:40 UTC

Size: 2.67 KB

patch

obsolete

>diff -Naupr thttpd-2.25b.orig/libhttpd.c thttpd-2.25b/libhttpd.c
>--- thttpd-2.25b.orig/libhttpd.c	2005-06-29 13:50:39.000000000 -0400
>+++ thttpd-2.25b/libhttpd.c	2014-03-15 08:37:30.689905822 -0400
>@@ -2544,16 +2544,14 @@ figure_mime( httpd_conn* hc )
> 
>     /* Peel off encoding extensions until there aren't any more. */
>     n_me_indexes = 0;
>+    hc->type = default_type;
>     for ( prev_dot = &hc->expnfilename[strlen(hc->expnfilename)]; ; prev_dot = dot )
> 	{
> 	for ( dot = prev_dot - 1; dot >= hc->expnfilename && *dot != '.'; --dot )
> 	    ;
> 	if ( dot < hc->expnfilename )
> 	    {
>-	    /* No dot found.  No more encoding extensions, and no type
>-	    ** extension either.
>-	    */
>-	    hc->type = default_type;
>+	    /* No dot found.  No more extensions.  */
> 	    goto done;
> 	    }
> 	ext = dot + 1;
>@@ -2570,39 +2568,33 @@ figure_mime( httpd_conn* hc )
> 		    me_indexes[n_me_indexes] = i;
> 		    ++n_me_indexes;
> 		    }
>-		goto next;
>+		break;
> 		}
> 	    }
>-	/* No encoding extension found.  Break and look for a type extension. */
>-	break;
>-
>-	next: ;
>+        /* Binary search for a matching type extension. */
>+        top = n_typ_tab - 1;
>+        bot = 0;
>+        while ( top >= bot )
>+            {
>+            mid = ( top + bot ) / 2;
>+            r = strncasecmp( ext, typ_tab[mid].ext, ext_len );
>+            if ( r < 0 )
>+                top = mid - 1;
>+            else if ( r > 0 )
>+                bot = mid + 1;
>+            else
>+                if ( ext_len < typ_tab[mid].ext_len )
>+                    top = mid - 1;
>+                else if ( ext_len > typ_tab[mid].ext_len )
>+                    bot = mid + 1;
>+                else
>+                    {
>+                    hc->type = typ_tab[mid].val;
>+                    goto done;
>+                    }
>+            }
> 	}
> 
>-    /* Binary search for a matching type extension. */
>-    top = n_typ_tab - 1;
>-    bot = 0;
>-    while ( top >= bot )
>-	{
>-	mid = ( top + bot ) / 2;
>-	r = strncasecmp( ext, typ_tab[mid].ext, ext_len );
>-	if ( r < 0 )
>-	    top = mid - 1;
>-	else if ( r > 0 )
>-	    bot = mid + 1;
>-	else
>-	    if ( ext_len < typ_tab[mid].ext_len )
>-		top = mid - 1;
>-	    else if ( ext_len > typ_tab[mid].ext_len )
>-		bot = mid + 1;
>-	    else
>-		{
>-		hc->type = typ_tab[mid].val;
>-		goto done;
>-		}
>-	}
>-    hc->type = default_type;
>-
>     done:
> 
>     /* The last thing we do is actually generate the mime-encoding header. */
>diff -Naupr thttpd-2.25b.orig/mime_encodings.txt thttpd-2.25b/mime_encodings.txt
>--- thttpd-2.25b.orig/mime_encodings.txt	2001-12-23 15:09:30.000000000 -0500
>+++ thttpd-2.25b/mime_encodings.txt	2014-03-15 09:14:01.886860465 -0400
>@@ -5,4 +5,5 @@
> 
> Z	compress
> gz	gzip
>+svgz    gzip
> uu	x-uuencode

Actions: View | Diff

Attachments on bug 1076830: 874797