Changeset 1464

Timestamp:

02/12/10 03:52:35 (2 years ago)

Author:

mitchb

Message:

What's that?  I can't hear you over the static!

o Make Apache, suEXEC, and static-cat case-insensitive about extensions
o Add wav, mid, and midi as static extensions
o Add missing mime-type for svg files

Location:

trunk/server/common

Files:

• oursrc/execsys/mime.types (modified) (1 diff)
• oursrc/execsys/static-cat.c.pre (modified) (1 diff)
• oursrc/execsys/upd-execsys (modified) (3 diffs)
• patches/httpd-suexec-scripts.patch (modified) (3 diffs)

trunk/server/common/oursrc/execsys/mime.types

@@ -399 +399 @@
 image/prs.btif
 image/prs.pti
+image/svg+xml                   svg
 image/tiff                      tiff tif
 image/vnd.cns.inf2

trunk/server/common/oursrc/execsys/static-cat.c.pre

@@ -336 +336 @@
                         exit(0);
                 for (j = 0; j < 2 * NEXTS; j += 2) {
-                        if (strcmp(map[j], &argv[1][i]) == 0) {
+                        if (strcasecmp(map[j], &argv[1][i]) == 0) {
                                 content_type = map[j + 1];
                         }

trunk/server/common/oursrc/execsys/upd-execsys

@@ -61 +61 @@
  avi
  il
- JPG
  xhtml
  svg
  xaml
  xap
+ wav
+ mid
+ midi
 );
 
@@ -77 +79 @@
         foreach my $ext (split " ", $exts) {
                 $map{$ext} = $type;
-                $map{uc($ext)} = $type;
         }
 }
@@ -89 +90 @@
 foreach my $ext (@dynamic, @static) {
         print CONF <<END
-<Files *.$ext>
+<FilesMatch "(?i)\\.$ext\$">
         SetHandler cgi-script
         Options +ExecCGI
-</Files>
+</FilesMatch>
 
 END

trunk/server/common/patches/httpd-suexec-scripts.patch

@@ -73 +73 @@
  
      /* variable name is */
-@@ -245,9 +250,67 @@
+@@ -245,9 +250,69 @@
      environ = cleanenv;
  }
@@ -108 +108 @@
 +    "avi",
 +    "il",
-+    "JPG",
 +    "xhtml",
 +    "svg",
 +    "xaml",
 +    "xap",
++    "wav",
++    "mid",
++    "midi",
 +    NULL
 +};
@@ -122 +124 @@
 +    if (extension == NULL) return 0;
 +    for (p = static_extensions; *p; ++p) {
-+        if (strcmp(extension + 1, *p) == 0) return 1;
++        if (strcasecmp(extension + 1, *p) == 0) return 1;
 +    }
 +    return 0;