Changeset 1877


Ignore:
Timestamp:
Jun 7, 2011, 12:23:31 PM (11 years ago)
Author:
geofft
Message:
static-cat: Add all MS Office (including OOXML) and ODF types
Location:
trunk/server/common
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/common/oursrc/execsys/mime.types

    r1784 r1877  
    509509application/xaml+xml            xaml
    510510application/x-silverlight-app   xap
     511# The following MS Office MIME types are from this source:
     512# http://blogs.msdn.com/b/vsofficedeveloper/archive/2008/05/08/office-2007-open-xml-mime-types.aspx
     513# There's a typo in .potm that's corrected in this alternate source:
     514# http://therightstuff.de/2006/12/16/Office+2007+File+Icons+For+Windows+SharePoint+Services+20+And+SharePoint+Portal+Server+2003.aspx
     515application/msword      dot
     516application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
     517application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
     518application/vnd.ms-word.document.macroEnabled.12        docm
     519application/vnd.ms-word.template.macroEnabled.12        dotm
     520application/vnd.ms-excel        xlt
     521application/vnd.ms-excel        xla
     522application/vnd.openxmlformats-officedocument.spreadsheetml.sheet       xlsx
     523application/vnd.openxmlformats-officedocument.spreadsheetml.template    xltx
     524application/vnd.ms-excel.sheet.macroEnabled.12  xlsm
     525application/vnd.ms-excel.template.macroEnabled.12       xltm
     526application/vnd.ms-excel.addin.macroEnabled.12  xlam
     527application/vnd.ms-excel.sheet.binary.macroEnabled.12   xlsb
     528application/vnd.ms-powerpoint   pot
     529application/vnd.ms-powerpoint   pps
     530application/vnd.ms-powerpoint   ppa
     531application/vnd.openxmlformats-officedocument.presentationml.presentation       pptx
     532application/vnd.openxmlformats-officedocument.presentationml.template   potx
     533application/vnd.openxmlformats-officedocument.presentationml.slideshow  ppsx
     534application/vnd.ms-powerpoint.addin.macroEnabled.12     ppam
     535application/vnd.ms-powerpoint.presentation.macroEnabled.12      pptm
     536application/vnd.ms-powerpoint.template.macroEnabled.12  potm
     537application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm
     538# End MS Office MIME types.
  • trunk/server/common/oursrc/execsys/upd-execsys

    r1784 r1877  
    5353 xls
    5454 ppt
     55 dot
     56 docx
     57 dotx
     58 docm
     59 dotm
     60 xlt
     61 xla
     62 xlsx
     63 xltx
     64 xlsm
     65 xltm
     66 xlam
     67 xlsb
     68 pot
     69 pps
     70 ppa
     71 pptx
     72 potx
     73 ppsx
     74 ppam
     75 pptm
     76 potm
     77 ppsm
    5578 swf
    5679 mp3
     
    7093 ttf
    7194 otf
     95 odc
     96 odb
     97 odf
     98 odg
     99 otg
     100 odi
     101 odp
     102 otp
     103 ods
     104 ots
     105 odt
     106 odm
     107 ott
     108 oth
    72109);
    73110
  • trunk/server/common/oursrc/scripts-static-cat/StaticCat.hs

    r1784 r1877  
    3535         (".css", "text/css"),
    3636         (".doc", "application/msword"),
     37         (".docm", "application/vnd.ms-word.document.macroEnabled.12"),
     38         (".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
     39         (".dot", "application/msword"),
     40         (".dotm", "application/vnd.ms-word.template.macroEnabled.12"),
     41         (".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"),
    3742         (".gif", "image/gif"),
    3843         (".htm", "text/html"),
     
    5055         (".mpeg", "video/mpeg"),
    5156         (".mpg", "video/mpeg"),
     57         (".odb", "application/vnd.oasis.opendocument.database"),
     58         (".odc", "application/vnd.oasis.opendocument.chart"),
     59         (".odf", "application/vnd.oasis.opendocument.formula"),
     60         (".odg", "application/vnd.oasis.opendocument.graphics"),
     61         (".odi", "application/vnd.oasis.opendocument.image"),
     62         (".odm", "application/vnd.oasis.opendocument.text-master"),
     63         (".odp", "application/vnd.oasis.opendocument.presentation"),
     64         (".ods", "application/vnd.oasis.opendocument.spreadsheet"),
     65         (".odt", "application/vnd.oasis.opendocument.text"),
    5266         (".otf", "application/octet-stream"),
     67         (".otg", "application/vnd.oasis.opendocument.graphics-template"),
     68         (".oth", "application/vnd.oasis.opendocument.text-web"),
     69         (".otp", "application/vnd.oasis.opendocument.presentation-template"),
     70         (".ots", "application/vnd.oasis.opendocument.spreadsheet-template"),
     71         (".ott", "application/vnd.oasis.opendocument.text-template"),
    5372         (".pdf", "application/pdf"),
    5473         (".png", "image/png"),
     74         (".pot", "application/vnd.ms-powerpoint"),
     75         (".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12"),
     76         (".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"),
     77         (".ppa", "application/vnd.ms-powerpoint"),
     78         (".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12"),
     79         (".pps", "application/vnd.ms-powerpoint"),
     80         (".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12"),
     81         (".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"),
    5582         (".ppt", "application/vnd.ms-powerpoint"),
     83         (".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12"),
     84         (".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"),
    5685         (".ps", "application/postscript"),
    5786         (".svg", "image/svg+xml"),
     
    6796         (".xap", "application/x-silverlight-app"),
    6897         (".xhtml", "application/xhtml+xml"),
     98         (".xla", "application/vnd.ms-excel"),
     99         (".xlam", "application/vnd.ms-excel.addin.macroEnabled.12"),
    69100         (".xls", "application/vnd.ms-excel"),
     101         (".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12"),
     102         (".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12"),
     103         (".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"),
     104         (".xlt", "application/vnd.ms-excel"),
     105         (".xltm", "application/vnd.ms-excel.template.macroEnabled.12"),
     106         (".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"),
    70107         (".xml", "text/xml"),
    71108         (".xsl", "text/xml"),
  • trunk/server/common/patches/httpd-suexec-scripts.patch

    r1785 r1877  
    7373 
    7474     /* variable name is */
    75 @@ -245,9 +250,71 @@
     75@@ -245,9 +250,108 @@
    7676     environ = cleanenv;
    7777 }
     
    100100+    "xls",
    101101+    "ppt",
     102+    "dot",
     103+    "docx",
     104+    "dotx",
     105+    "docm",
     106+    "dotm",
     107+    "xlt",
     108+    "xla",
     109+    "xlsx",
     110+    "xltx",
     111+    "xlsm",
     112+    "xltm",
     113+    "xlam",
     114+    "xlsb",
     115+    "pot",
     116+    "pps",
     117+    "ppa",
     118+    "pptx",
     119+    "potx",
     120+    "ppsx",
     121+    "ppam",
     122+    "pptm",
     123+    "potm",
     124+    "ppsm",
    102125+    "swf",
    103126+    "mp3",
     
    117140+    "ttf",
    118141+    "otf",
     142+    "odc",
     143+    "odb",
     144+    "odf",
     145+    "odg",
     146+    "otg",
     147+    "odi",
     148+    "odp",
     149+    "otp",
     150+    "ods",
     151+    "ots",
     152+    "odt",
     153+    "odm",
     154+    "ott",
     155+    "oth",
    119156+    NULL
    120157+};
     
    145182     gid_t gid;              /* target group placeholder  */
    146183     char *target_uname;     /* target user name          */
    147 @@ -268,6 +331,7 @@
     184@@ -268,6 +368,7 @@
    148185      * Start with a "clean" environment
    149186      */
     
    153190     prog = argv[0];
    154191     /*
    155 @@ -350,6 +414,20 @@
     192@@ -350,6 +451,20 @@
    156193 #endif /*_OSD_POSIX*/
    157194 
     
    174211      * or attempts to back up out of the current directory,
    175212      * to protect against attacks.  If any are
    176 @@ -371,6 +449,7 @@
     213@@ -371,6 +486,7 @@
    177214         userdir = 1;
    178215     }
     
    182219      * Error out if the target username is invalid.
    183220      */
    184 @@ -452,7 +531,7 @@
     221@@ -452,7 +568,7 @@
    185222      * Error out if attempt is made to execute as root or as
    186223      * a UID less than AP_UID_MIN.  Tsk tsk.
     
    191228         exit(107);
    192229     }
    193 @@ -484,6 +563,7 @@
     230@@ -484,6 +599,7 @@
    194231         log_err("failed to setuid (%ld: %s)\n", uid, cmd);
    195232         exit(110);
     
    199236     /*
    200237      * Get the current working directory, as well as the proper
    201 @@ -506,6 +600,21 @@
     238@@ -506,6 +637,21 @@
    202239             log_err("cannot get docroot information (%s)\n", target_homedir);
    203240             exit(112);
     
    221258     else {
    222259         if (((chdir(AP_DOC_ROOT)) != 0) ||
    223 @@ -532,15 +641,17 @@
     260@@ -532,15 +678,17 @@
    224261     /*
    225262      * Error out if cwd is writable by others.
     
    240277         exit(117);
    241278     }
    242 @@ -548,10 +659,12 @@
     279@@ -548,10 +696,12 @@
    243280     /*
    244281      * Error out if the program is writable by others.
     
    253290     /*
    254291      * Error out if the file is setuid or setgid.
    255 @@ -565,6 +678,7 @@
     292@@ -565,6 +715,7 @@
    256293      * Error out if the target name/group is different from
    257294      * the name/group of the cwd or the program.
     
    261298         (gid != dir_info.st_gid) ||
    262299         (uid != prg_info.st_uid) ||
    263 @@ -576,12 +690,14 @@
     300@@ -576,12 +727,14 @@
    264301                 prg_info.st_uid, prg_info.st_gid);
    265302         exit(120);
     
    277314         exit(121);
    278315     }
    279 @@ -614,6 +730,23 @@
     316@@ -614,6 +767,23 @@
    280317     /*
    281318      * Execute the command, replacing our image with its own.
Note: See TracChangeset for help on using the changeset viewer.