myserver-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myserver-commit] [3018] Changed names for default configuration files.


From: Giuseppe Scrivano
Subject: [myserver-commit] [3018] Changed names for default configuration files.
Date: Sun, 01 Mar 2009 18:35:32 +0000

Revision: 3018
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3018
Author:   gscrivano
Date:     2009-03-01 18:35:31 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Changed names for default configuration files.

Modified Paths:
--------------
    trunk/myserver/binaries/NSIS installer script.nsi
    trunk/myserver/binaries/clean_copy.sh
    trunk/myserver/src/myserver.cpp
    trunk/myserver/src/server/server.cpp

Added Paths:
-----------
    trunk/myserver/binaries/MIMEtypes.default.windows.xml
    trunk/myserver/binaries/MIMEtypes.default.xml
    trunk/myserver/binaries/myserver.default.windows.xml
    trunk/myserver/binaries/myserver.default.xml
    trunk/myserver/binaries/virtualhosts.default.windows.xml
    trunk/myserver/binaries/virtualhosts.default.xml

Removed Paths:
-------------
    trunk/myserver/binaries/MIMEtypes.xml.default
    trunk/myserver/binaries/MIMEtypes.xml.unix.default
    trunk/myserver/binaries/myserver.xml.default
    trunk/myserver/binaries/myserver.xml.unix.default
    trunk/myserver/binaries/virtualhosts.xml.default
    trunk/myserver/binaries/virtualhosts.xml.unix.default

Added: trunk/myserver/binaries/MIMEtypes.default.windows.xml
===================================================================
--- trunk/myserver/binaries/MIMEtypes.default.windows.xml                       
        (rev 0)
+++ trunk/myserver/binaries/MIMEtypes.default.windows.xml       2009-03-01 
18:35:31 UTC (rev 3018)
@@ -0,0 +1,503 @@
+<?xml version="1.0"?>
+
+<MIMES>
+  <MIME mime="text/html" handler="MSCGI" param="">
+    <EXTENSION value="mscgi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="CGI" self="YES" param="">
+    <EXTENSION value="cgi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="ISAPI" param="">
+    <EXTENSION value="isapi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="SCGI" self="YES" param="">
+    <EXTENSION value="scgi"/>
+  </MIME>
+
+  <MIME mime="text/html" handler="FASTCGI" self="YES" param="">
+    <EXTENSION value="fcgi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="WINCGI" param="">
+    <EXTENSION value="wincgi"/>
+  </MIME>
+
+
+  <MIME mime="application/postscript" handler="SEND" param="">
+    <EXTENSION value="ai"/>
+    <EXTENSION value="eps"/>
+    <EXTENSION value="ps"/>
+  </MIME>
+  
+  <MIME mime="video/quicktime" handler="SEND" param="">
+    <EXTENSION value="mov"/>
+    <EXTENSION value="qt"/>
+  </MIME>
+
+  <MIME mime="image/png" handler="SEND" param="">
+    <EXTENSION value="png"/>
+  </MIME>
+
+  <MIME mime="video/vndvivo" handler="SEND" param="">
+    <EXTENSION value="viv"/>
+    <EXTENSION value="vivo"/>
+  </MIME>
+
+  <MIME mime="application/xtex" handler="SEND" param="">
+    <EXTENSION value="tex"/>
+  </MIME>
+
+  <MIME mime="text/xsetext" handler="SEND" param="">
+    <EXTENSION value="etx"/>
+  </MIME>
+
+  <MIME mime="application/vda" handler="SEND" param="">
+    <EXTENSION value="vda"/>
+  </MIME>
+
+  <MIME mime="application/dsptype" handler="SEND" param="">
+    <EXTENSION value="tsp"/>
+  </MIME>
+
+  <MIME mime="application/xstuffit" handler="SEND" param="">
+    <EXTENSION value="sit"/>
+  </MIME>
+
+  <MIME mime="application/solids" handler="SEND" param="">
+    <EXTENSION value="sol"/>
+  </MIME>
+
+  <MIME mime="application/xfuturesplash" handler="SEND" param="">
+    <EXTENSION value="spl"/>
+  </MIME>
+
+  <MIME mime="application/xbcpio" handler="SEND" param="">
+    <EXTENSION value="bcpio"/>
+  </MIME>
+
+  <MIME mime="application/oda" handler="SEND" param="">
+    <EXTENSION value="oda"/>
+  </MIME>
+
+  <MIME mime="application/pro_eng" handler="SEND" param="">
+    <EXTENSION value="prt"/>
+  </MIME>
+
+  <MIME mime="model/iges" handler="SEND" param="">
+    <EXTENSION value="iges"/>
+    <EXTENSION value="igs"/>
+  </MIME>
+
+  <MIME mime="audio/TSPaudio" handler="SEND" param="">
+    <EXTENSION value="tsi"/>
+  </MIME>
+
+  <MIME mime="image/xportablegraymap" handler="SEND" param="">
+    <EXTENSION value="pgm"/>
+  </MIME>
+
+  <MIME mime="application/xlatex" handler="SEND" param="">
+    <EXTENSION value="latex"/>
+  </MIME>
+
+  <MIME mime="application/xsh" handler="SEND" param="">
+    <EXTENSION value="sh"/>
+  </MIME>
+
+  <MIME mime="application/drafting" handler="SEND" param="">
+    <EXTENSION value="drw"/>
+  </MIME>
+
+  <MIME mime="text/html" handler="SEND" param="">
+    <EXTENSION value="htm"/>
+    <EXTENSION value="html"/>
+  </MIME>
+
+  <MIME mime="application/smil" handler="SEND" param="">
+    <EXTENSION value="smi"/>
+    <EXTENSION value="smil"/>
+  </MIME>
+
+  <MIME mime="application/vndmif" handler="SEND" param="">
+    <EXTENSION value="mif"/>
+  </MIME>
+
+  <MIME mime="application/xipix" handler="SEND" param="">
+    <EXTENSION value="ipx"/>
+  </MIME>
+
+  <MIME mime="model/mesh" handler="SEND" param="">
+    <EXTENSION value="mesh"/>
+    <EXTENSION value="msh"/>
+    <EXTENSION value="silo"/>
+  </MIME>
+
+  <MIME mime="application/xtroffman" handler="SEND" param="">
+    <EXTENSION value="man"/>
+  </MIME>
+
+  <MIME mime="application/xcsh" handler="SEND" param="">
+    <EXTENSION value="csh"/>
+  </MIME>
+
+  <MIME mime="audio/xpnrealaudioplugin" handler="SEND" param="">
+    <EXTENSION value="rpm"/>
+  </MIME>
+
+  <MIME mime="image/cmuraster" handler="SEND" param="">
+    <EXTENSION value="ras"/>
+  </MIME>
+
+  <MIME mime="www/mime" handler="SEND" param="">
+    <EXTENSION value="mime"/>
+  </MIME>
+
+  <MIME mime="application/xdirector" handler="SEND" param="">
+    <EXTENSION value="dcr"/>
+    <EXTENSION value="dir"/>
+    <EXTENSION value="dxr"/>
+  </MIME>
+
+  <MIME mime="text/xml" handler="SEND" param="">
+    <EXTENSION value="xml"/>
+  </MIME>
+
+  <MIME mime="application/xfreelance" handler="SEND" param="">
+    <EXTENSION value="pre"/>
+  </MIME>
+
+  <MIME mime="image/ief" handler="SEND" param="">
+    <EXTENSION value="ief"/>
+  </MIME>
+
+  <MIME mime="application/xshar" handler="SEND" param="">
+    <EXTENSION value="shar"/>
+  </MIME>
+
+  <MIME mime="audio/xrealaudio" handler="SEND" param="">
+    <EXTENSION value="ra"/>
+  </MIME>
+
+  <MIME mime="application/mspowerpoint" handler="SEND" param="">
+    <EXTENSION value="pot"/>
+    <EXTENSION value="pps"/>
+    <EXTENSION value="ppt"/>
+    <EXTENSION value="ppz"/>
+  </MIME>
+
+  <MIME mime="audio/midi" handler="SEND" param="">
+    <EXTENSION value="kar"/>
+    <EXTENSION value="mid"/>
+    <EXTENSION value="midi"/>
+  </MIME>
+
+  <MIME mime="image/jpeg" handler="SEND" param="">
+    <EXTENSION value="jpe"/>
+    <EXTENSION value="jpeg"/>
+    <EXTENSION value="jpg"/>
+  </MIME>
+
+  <MIME mime="application/xkoan" handler="SEND" param="">
+    <EXTENSION value="skd"/>
+    <EXTENSION value="skm"/>
+    <EXTENSION value="skp"/>
+    <EXTENSION value="skt"/>
+  </MIME>
+
+  <MIME mime="application/SLA" handler="SEND" param="">
+    <EXTENSION value="stl"/>
+  </MIME>
+
+  <MIME mime="application/STEP" handler="SEND" param="">
+    <EXTENSION value="step"/>
+    <EXTENSION value="stp"/>
+  </MIME>
+
+  <MIME mime="application/xshockwaveflash" handler="SEND" param="">
+    <EXTENSION value="swf"/>
+  </MIME>
+
+  <MIME mime="image/xxwindowdump" handler="SEND" param="">
+    <EXTENSION value="xwd"/>
+  </MIME>
+
+  <MIME mime="image/xxbitmap" handler="SEND" param="">
+    <EXTENSION value="xbm"/>
+  </MIME>
+
+  <MIME mime="application/dxf" handler="SEND" param="">
+    <EXTENSION value="dxf"/>
+  </MIME>
+
+  <MIME mime="text/sgml" handler="SEND" param="">
+    <EXTENSION value="sgm"/>
+    <EXTENSION value="sgml"/>
+  </MIME>
+
+  <MIME mime="model/vrml" handler="SEND" param="">
+    <EXTENSION value="vrml"/>
+    <EXTENSION value="wrl"/>
+  </MIME>
+
+  <MIME mime="application/xipscript" handler="SEND" param="">
+    <EXTENSION value="ips"/>
+  </MIME>
+
+  <MIME mime="image/xportablepixmap" handler="SEND" param="">
+    <EXTENSION value="ppm"/>
+  </MIME>
+
+  <MIME mime="text/plain" handler="SEND" param="">
+    <EXTENSION value="asc"/>
+    <EXTENSION value="c"/>
+    <EXTENSION value="cc"/>
+    <EXTENSION value="f"/>
+    <EXTENSION value="f90"/>
+    <EXTENSION value="h"/>
+    <EXTENSION value="hh"/>
+    <EXTENSION value="m"/>
+    <EXTENSION value="txt"/>
+  </MIME>
+
+  <MIME mime="application/set" handler="SEND" param="">
+    <EXTENSION value="set"/>
+  </MIME>
+
+  <MIME mime="video/xmsvideo" handler="SEND" param="">
+    <EXTENSION value="avi"/>
+  </MIME>
+
+  <MIME mime="audio/xwav" handler="SEND" param="">
+    <EXTENSION value="wav"/>
+  </MIME>
+
+  <MIME mime="application/xgtar" handler="SEND" param="">
+    <EXTENSION value="gtar"/>
+  </MIME>
+
+  <MIME mime="application/xwaissource" handler="SEND" param="">
+    <EXTENSION value="src"/>
+  </MIME>
+
+  <MIME mime="application/acad" handler="SEND" param="">
+    <EXTENSION value="dwg"/>
+  </MIME>
+
+  <MIME mime="application/xlisp" handler="SEND" param="">
+    <EXTENSION value="lsp"/>
+  </MIME>
+
+  <MIME mime="application/zip" handler="SEND" param="">
+    <EXTENSION value="zip"/>
+  </MIME>
+
+  <MIME mime="audio/xpnrealaudio" handler="SEND" param="">
+    <EXTENSION value="ram"/>
+    <EXTENSION value="rm"/>
+  </MIME>
+
+  <MIME mime="text/tabseparatedvalues" handler="SEND" param="">
+    <EXTENSION value="tsv"/>
+  </MIME>
+
+  <MIME mime="image/xxpixmap" handler="SEND" param="">
+    <EXTENSION value="xpm"/>
+  </MIME>
+
+  <MIME mime="application/xtexinfo" handler="SEND" param="">
+    <EXTENSION value="texi"/>
+    <EXTENSION value="texinfo"/>
+  </MIME>
+
+  <MIME mime="application/xustar" handler="SEND" param="">
+    <EXTENSION value="ustar"/>
+  </MIME>
+
+  <MIME mime="application/xcpio" handler="SEND" param="">
+    <EXTENSION value="cpio"/>
+  </MIME>
+
+  <MIME mime="application/vndmsexcel" handler="SEND" param="">
+    <EXTENSION value="xlc"/>
+    <EXTENSION value="xll"/>
+    <EXTENSION value="xlm"/>
+    <EXTENSION value="xls"/>
+    <EXTENSION value="xlw"/>
+  </MIME>
+
+  <MIME mime="image/xrgb" handler="SEND" param="">
+    <EXTENSION value="rgb"/>
+  </MIME>
+
+  <MIME mime="image/xportablebitmap" handler="SEND" param="">
+    <EXTENSION value="pbm"/>
+  </MIME>
+
+  <MIME mime="application/pdf" handler="SEND" param="">
+    <EXTENSION value="pdf"/>
+  </MIME>
+
+  <MIME mime="application/xjavascript" handler="SEND" param="">
+    <EXTENSION value="js"/>
+  </MIME>
+
+  <MIME mime="application/xcdlink" handler="SEND" param="">
+    <EXTENSION value="vcd"/>
+  </MIME>
+
+  <MIME mime="chemical/xpdb" handler="SEND" param="">
+    <EXTENSION value="pdb"/>
+    <EXTENSION value="xyz"/>
+  </MIME>
+
+  <MIME mime="application/xsv4crc" handler="SEND" param="">
+    <EXTENSION value="sv4crc"/>
+  </MIME>
+
+  <MIME mime="image/gif" handler="SEND" param="">
+    <EXTENSION value="gif"/>
+  </MIME>
+
+  <MIME mime="application/xlotusscreencam" handler="SEND" param="">
+    <EXTENSION value="scm"/>
+  </MIME>
+
+  <MIME mime="image/tiff" handler="SEND" param="">
+    <EXTENSION value="tif"/>
+    <EXTENSION value="tiff"/>
+  </MIME>
+
+  <MIME mime="application/maccompactpro" handler="SEND" param="">
+    <EXTENSION value="cpt"/>
+  </MIME>
+
+  <MIME mime="application/clariscad" handler="SEND" param="">
+    <EXTENSION value="ccad"/>
+  </MIME>
+
+  <MIME mime="video/mpeg" handler="SEND" param="">
+    <EXTENSION value="mpe"/>
+    <EXTENSION value="mpeg"/>
+    <EXTENSION value="mpg"/>
+  </MIME>
+
+  <MIME mime="application/xtcl" handler="SEND" param="">
+    <EXTENSION value="tcl"/>
+  </MIME>
+
+  <MIME mime="application/xhdf" handler="SEND" param="">
+    <EXTENSION value="hdf"/>
+  </MIME>
+
+  <MIME mime="text/css" handler="SEND" param="">
+    <EXTENSION value="css"/>
+  </MIME>
+
+  <MIME mime="application/xtroff" handler="SEND" param="">
+    <EXTENSION value="roff"/>
+    <EXTENSION value="t"/>
+    <EXTENSION value="tr"/>
+  </MIME>
+
+  <MIME mime="application/macbinhex40" handler="SEND" param="">
+    <EXTENSION value="hqx"/>
+  </MIME>
+
+  <MIME mime="application/ideas" handler="SEND" param="">
+    <EXTENSION value="unv"/>
+  </MIME>
+
+  <MIME mime="audio/xaiff" handler="SEND" param="">
+    <EXTENSION value="aif"/>
+    <EXTENSION value="aifc"/>
+    <EXTENSION value="aiff"/>
+  </MIME>
+
+  <MIME mime="application/xdvi" handler="SEND" param="">
+    <EXTENSION value="dvi"/>
+  </MIME>
+
+  <MIME mime="application/andrewinset" handler="SEND" param="">
+    <EXTENSION value="ez"/>
+  </MIME>
+
+  <MIME mime="application/xnetcdf" handler="SEND" param="">
+    <EXTENSION value="cdf"/>
+    <EXTENSION value="nc"/>
+  </MIME>
+
+  <MIME mime="application/xsv4cpio" handler="SEND" param="">
+    <EXTENSION value="sv4cpio"/>
+  </MIME>
+
+  <MIME mime="video/xsgimovie" handler="SEND" param="">
+    <EXTENSION value="movie"/>
+  </MIME>
+
+  <MIME mime="audio/mpeg" handler="SEND" param="">
+    <EXTENSION value="mp2"/>
+    <EXTENSION value="mp3"/>
+    <EXTENSION value="mpga"/>
+  </MIME>
+
+  <MIME mime="application/xtroffme" handler="SEND" param="">
+    <EXTENSION value="me"/>
+  </MIME>
+
+  <MIME mime="xconference/xcooltalk" handler="SEND" param="">
+    <EXTENSION value="ice"/>
+  </MIME>
+
+  <MIME mime="application/octetstream" handler="SEND" param="">
+    <EXTENSION value="bin"/>
+    <EXTENSION value="class"/>
+    <EXTENSION value="dms"/>
+    <EXTENSION value="exe"/>
+    <EXTENSION value="lha"/>
+    <EXTENSION value="lzh"/>
+  </MIME>
+
+  <MIME mime="application/xtroffms" handler="SEND" param="">
+    <EXTENSION value="ms"/>
+  </MIME>
+
+  <MIME mime="application/xgzip" handler="SEND" param="">
+    <EXTENSION value="gz"/>
+  </MIME>
+
+  <MIME mime="audio/basic" handler="SEND" param="">
+    <EXTENSION value="au"/>
+    <EXTENSION value="snd"/>
+  </MIME>
+
+  <MIME mime="application/xtar" handler="SEND" param="">
+    <EXTENSION value="tar"/>
+  </MIME>
+
+  <MIME mime="text/rtf" handler="SEND" param="">
+    <EXTENSION value="rtf"/>
+  </MIME>
+
+  <MIME mime="text/richtext" handler="SEND" param="">
+    <EXTENSION value="rtx"/>
+  </MIME>
+
+  <MIME mime="image/xportableanymap" handler="SEND" param="">
+    <EXTENSION value="pnm"/>
+  </MIME>
+
+  <MIME mime="application/xchesspgn" handler="SEND" param="">
+    <EXTENSION value="pgn"/>
+  </MIME>
+
+  <MIME mime="video/xfli" handler="SEND" param="">
+    <EXTENSION value="fli"/>
+  </MIME>
+
+  <MIME mime="application/msword" handler="SEND" param="">
+    <EXTENSION value="doc"/>
+  </MIME>
+</MIMES>


Property changes on: trunk/myserver/binaries/MIMEtypes.default.windows.xml
___________________________________________________________________
Added: svn:executable
   + *

Copied: trunk/myserver/binaries/MIMEtypes.default.xml (from rev 3017, 
trunk/myserver/binaries/MIMEtypes.xml.unix.default)
===================================================================
--- trunk/myserver/binaries/MIMEtypes.default.xml                               
(rev 0)
+++ trunk/myserver/binaries/MIMEtypes.default.xml       2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -0,0 +1,503 @@
+<?xml version="1.0"?>
+
+<MIMES>
+  <MIME mime="text/html" handler="MSCGI" param="">
+    <EXTENSION value="mscgi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="CGI" self="YES" param="">
+    <EXTENSION value="cgi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="ISAPI" param="">
+    <EXTENSION value="isapi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="SCGI" self="YES" param="">
+    <EXTENSION value="scgi"/>
+  </MIME>
+
+  <MIME mime="text/html" handler="FASTCGI" self="YES" param="">
+    <EXTENSION value="fcgi"/>
+  </MIME>
+  
+  <MIME mime="text/html" handler="WINCGI" param="">
+    <EXTENSION value="wincgi"/>
+  </MIME>
+
+
+  <MIME mime="application/postscript" handler="SEND" param="">
+    <EXTENSION value="ai"/>
+    <EXTENSION value="eps"/>
+    <EXTENSION value="ps"/>
+  </MIME>
+  
+  <MIME mime="video/quicktime" handler="SEND" param="">
+    <EXTENSION value="mov"/>
+    <EXTENSION value="qt"/>
+  </MIME>
+
+  <MIME mime="image/png" handler="SEND" param="">
+    <EXTENSION value="png"/>
+  </MIME>
+
+  <MIME mime="video/vndvivo" handler="SEND" param="">
+    <EXTENSION value="viv"/>
+    <EXTENSION value="vivo"/>
+  </MIME>
+
+  <MIME mime="application/xtex" handler="SEND" param="">
+    <EXTENSION value="tex"/>
+  </MIME>
+
+  <MIME mime="text/xsetext" handler="SEND" param="">
+    <EXTENSION value="etx"/>
+  </MIME>
+
+  <MIME mime="application/vda" handler="SEND" param="">
+    <EXTENSION value="vda"/>
+  </MIME>
+
+  <MIME mime="application/dsptype" handler="SEND" param="">
+    <EXTENSION value="tsp"/>
+  </MIME>
+
+  <MIME mime="application/xstuffit" handler="SEND" param="">
+    <EXTENSION value="sit"/>
+  </MIME>
+
+  <MIME mime="application/solids" handler="SEND" param="">
+    <EXTENSION value="sol"/>
+  </MIME>
+
+  <MIME mime="application/xfuturesplash" handler="SEND" param="">
+    <EXTENSION value="spl"/>
+  </MIME>
+
+  <MIME mime="application/xbcpio" handler="SEND" param="">
+    <EXTENSION value="bcpio"/>
+  </MIME>
+
+  <MIME mime="application/oda" handler="SEND" param="">
+    <EXTENSION value="oda"/>
+  </MIME>
+
+  <MIME mime="application/pro_eng" handler="SEND" param="">
+    <EXTENSION value="prt"/>
+  </MIME>
+
+  <MIME mime="model/iges" handler="SEND" param="">
+    <EXTENSION value="iges"/>
+    <EXTENSION value="igs"/>
+  </MIME>
+
+  <MIME mime="audio/TSPaudio" handler="SEND" param="">
+    <EXTENSION value="tsi"/>
+  </MIME>
+
+  <MIME mime="image/xportablegraymap" handler="SEND" param="">
+    <EXTENSION value="pgm"/>
+  </MIME>
+
+  <MIME mime="application/xlatex" handler="SEND" param="">
+    <EXTENSION value="latex"/>
+  </MIME>
+
+  <MIME mime="application/xsh" handler="SEND" param="">
+    <EXTENSION value="sh"/>
+  </MIME>
+
+  <MIME mime="application/drafting" handler="SEND" param="">
+    <EXTENSION value="drw"/>
+  </MIME>
+
+  <MIME mime="text/html" handler="SEND" param="">
+    <EXTENSION value="htm"/>
+    <EXTENSION value="html"/>
+  </MIME>
+
+  <MIME mime="application/smil" handler="SEND" param="">
+    <EXTENSION value="smi"/>
+    <EXTENSION value="smil"/>
+  </MIME>
+
+  <MIME mime="application/vndmif" handler="SEND" param="">
+    <EXTENSION value="mif"/>
+  </MIME>
+
+  <MIME mime="application/xipix" handler="SEND" param="">
+    <EXTENSION value="ipx"/>
+  </MIME>
+
+  <MIME mime="model/mesh" handler="SEND" param="">
+    <EXTENSION value="mesh"/>
+    <EXTENSION value="msh"/>
+    <EXTENSION value="silo"/>
+  </MIME>
+
+  <MIME mime="application/xtroffman" handler="SEND" param="">
+    <EXTENSION value="man"/>
+  </MIME>
+
+  <MIME mime="application/xcsh" handler="SEND" param="">
+    <EXTENSION value="csh"/>
+  </MIME>
+
+  <MIME mime="audio/xpnrealaudioplugin" handler="SEND" param="">
+    <EXTENSION value="rpm"/>
+  </MIME>
+
+  <MIME mime="image/cmuraster" handler="SEND" param="">
+    <EXTENSION value="ras"/>
+  </MIME>
+
+  <MIME mime="www/mime" handler="SEND" param="">
+    <EXTENSION value="mime"/>
+  </MIME>
+
+  <MIME mime="application/xdirector" handler="SEND" param="">
+    <EXTENSION value="dcr"/>
+    <EXTENSION value="dir"/>
+    <EXTENSION value="dxr"/>
+  </MIME>
+
+  <MIME mime="text/xml" handler="SEND" param="">
+    <EXTENSION value="xml"/>
+  </MIME>
+
+  <MIME mime="application/xfreelance" handler="SEND" param="">
+    <EXTENSION value="pre"/>
+  </MIME>
+
+  <MIME mime="image/ief" handler="SEND" param="">
+    <EXTENSION value="ief"/>
+  </MIME>
+
+  <MIME mime="application/xshar" handler="SEND" param="">
+    <EXTENSION value="shar"/>
+  </MIME>
+
+  <MIME mime="audio/xrealaudio" handler="SEND" param="">
+    <EXTENSION value="ra"/>
+  </MIME>
+
+  <MIME mime="application/mspowerpoint" handler="SEND" param="">
+    <EXTENSION value="pot"/>
+    <EXTENSION value="pps"/>
+    <EXTENSION value="ppt"/>
+    <EXTENSION value="ppz"/>
+  </MIME>
+
+  <MIME mime="audio/midi" handler="SEND" param="">
+    <EXTENSION value="kar"/>
+    <EXTENSION value="mid"/>
+    <EXTENSION value="midi"/>
+  </MIME>
+
+  <MIME mime="image/jpeg" handler="SEND" param="">
+    <EXTENSION value="jpe"/>
+    <EXTENSION value="jpeg"/>
+    <EXTENSION value="jpg"/>
+  </MIME>
+
+  <MIME mime="application/xkoan" handler="SEND" param="">
+    <EXTENSION value="skd"/>
+    <EXTENSION value="skm"/>
+    <EXTENSION value="skp"/>
+    <EXTENSION value="skt"/>
+  </MIME>
+
+  <MIME mime="application/SLA" handler="SEND" param="">
+    <EXTENSION value="stl"/>
+  </MIME>
+
+  <MIME mime="application/STEP" handler="SEND" param="">
+    <EXTENSION value="step"/>
+    <EXTENSION value="stp"/>
+  </MIME>
+
+  <MIME mime="application/xshockwaveflash" handler="SEND" param="">
+    <EXTENSION value="swf"/>
+  </MIME>
+
+  <MIME mime="image/xxwindowdump" handler="SEND" param="">
+    <EXTENSION value="xwd"/>
+  </MIME>
+
+  <MIME mime="image/xxbitmap" handler="SEND" param="">
+    <EXTENSION value="xbm"/>
+  </MIME>
+
+  <MIME mime="application/dxf" handler="SEND" param="">
+    <EXTENSION value="dxf"/>
+  </MIME>
+
+  <MIME mime="text/sgml" handler="SEND" param="">
+    <EXTENSION value="sgm"/>
+    <EXTENSION value="sgml"/>
+  </MIME>
+
+  <MIME mime="model/vrml" handler="SEND" param="">
+    <EXTENSION value="vrml"/>
+    <EXTENSION value="wrl"/>
+  </MIME>
+
+  <MIME mime="application/xipscript" handler="SEND" param="">
+    <EXTENSION value="ips"/>
+  </MIME>
+
+  <MIME mime="image/xportablepixmap" handler="SEND" param="">
+    <EXTENSION value="ppm"/>
+  </MIME>
+
+  <MIME mime="text/plain" handler="SEND" param="">
+    <EXTENSION value="asc"/>
+    <EXTENSION value="c"/>
+    <EXTENSION value="cc"/>
+    <EXTENSION value="f"/>
+    <EXTENSION value="f90"/>
+    <EXTENSION value="h"/>
+    <EXTENSION value="hh"/>
+    <EXTENSION value="m"/>
+    <EXTENSION value="txt"/>
+  </MIME>
+
+  <MIME mime="application/set" handler="SEND" param="">
+    <EXTENSION value="set"/>
+  </MIME>
+
+  <MIME mime="video/xmsvideo" handler="SEND" param="">
+    <EXTENSION value="avi"/>
+  </MIME>
+
+  <MIME mime="audio/xwav" handler="SEND" param="">
+    <EXTENSION value="wav"/>
+  </MIME>
+
+  <MIME mime="application/xgtar" handler="SEND" param="">
+    <EXTENSION value="gtar"/>
+  </MIME>
+
+  <MIME mime="application/xwaissource" handler="SEND" param="">
+    <EXTENSION value="src"/>
+  </MIME>
+
+  <MIME mime="application/acad" handler="SEND" param="">
+    <EXTENSION value="dwg"/>
+  </MIME>
+
+  <MIME mime="application/xlisp" handler="SEND" param="">
+    <EXTENSION value="lsp"/>
+  </MIME>
+
+  <MIME mime="application/zip" handler="SEND" param="">
+    <EXTENSION value="zip"/>
+  </MIME>
+
+  <MIME mime="audio/xpnrealaudio" handler="SEND" param="">
+    <EXTENSION value="ram"/>
+    <EXTENSION value="rm"/>
+  </MIME>
+
+  <MIME mime="text/tabseparatedvalues" handler="SEND" param="">
+    <EXTENSION value="tsv"/>
+  </MIME>
+
+  <MIME mime="image/xxpixmap" handler="SEND" param="">
+    <EXTENSION value="xpm"/>
+  </MIME>
+
+  <MIME mime="application/xtexinfo" handler="SEND" param="">
+    <EXTENSION value="texi"/>
+    <EXTENSION value="texinfo"/>
+  </MIME>
+
+  <MIME mime="application/xustar" handler="SEND" param="">
+    <EXTENSION value="ustar"/>
+  </MIME>
+
+  <MIME mime="application/xcpio" handler="SEND" param="">
+    <EXTENSION value="cpio"/>
+  </MIME>
+
+  <MIME mime="application/vndmsexcel" handler="SEND" param="">
+    <EXTENSION value="xlc"/>
+    <EXTENSION value="xll"/>
+    <EXTENSION value="xlm"/>
+    <EXTENSION value="xls"/>
+    <EXTENSION value="xlw"/>
+  </MIME>
+
+  <MIME mime="image/xrgb" handler="SEND" param="">
+    <EXTENSION value="rgb"/>
+  </MIME>
+
+  <MIME mime="image/xportablebitmap" handler="SEND" param="">
+    <EXTENSION value="pbm"/>
+  </MIME>
+
+  <MIME mime="application/pdf" handler="SEND" param="">
+    <EXTENSION value="pdf"/>
+  </MIME>
+
+  <MIME mime="application/xjavascript" handler="SEND" param="">
+    <EXTENSION value="js"/>
+  </MIME>
+
+  <MIME mime="application/xcdlink" handler="SEND" param="">
+    <EXTENSION value="vcd"/>
+  </MIME>
+
+  <MIME mime="chemical/xpdb" handler="SEND" param="">
+    <EXTENSION value="pdb"/>
+    <EXTENSION value="xyz"/>
+  </MIME>
+
+  <MIME mime="application/xsv4crc" handler="SEND" param="">
+    <EXTENSION value="sv4crc"/>
+  </MIME>
+
+  <MIME mime="image/gif" handler="SEND" param="">
+    <EXTENSION value="gif"/>
+  </MIME>
+
+  <MIME mime="application/xlotusscreencam" handler="SEND" param="">
+    <EXTENSION value="scm"/>
+  </MIME>
+
+  <MIME mime="image/tiff" handler="SEND" param="">
+    <EXTENSION value="tif"/>
+    <EXTENSION value="tiff"/>
+  </MIME>
+
+  <MIME mime="application/maccompactpro" handler="SEND" param="">
+    <EXTENSION value="cpt"/>
+  </MIME>
+
+  <MIME mime="application/clariscad" handler="SEND" param="">
+    <EXTENSION value="ccad"/>
+  </MIME>
+
+  <MIME mime="video/mpeg" handler="SEND" param="">
+    <EXTENSION value="mpe"/>
+    <EXTENSION value="mpeg"/>
+    <EXTENSION value="mpg"/>
+  </MIME>
+
+  <MIME mime="application/xtcl" handler="SEND" param="">
+    <EXTENSION value="tcl"/>
+  </MIME>
+
+  <MIME mime="application/xhdf" handler="SEND" param="">
+    <EXTENSION value="hdf"/>
+  </MIME>
+
+  <MIME mime="text/css" handler="SEND" param="">
+    <EXTENSION value="css"/>
+  </MIME>
+
+  <MIME mime="application/xtroff" handler="SEND" param="">
+    <EXTENSION value="roff"/>
+    <EXTENSION value="t"/>
+    <EXTENSION value="tr"/>
+  </MIME>
+
+  <MIME mime="application/macbinhex40" handler="SEND" param="">
+    <EXTENSION value="hqx"/>
+  </MIME>
+
+  <MIME mime="application/ideas" handler="SEND" param="">
+    <EXTENSION value="unv"/>
+  </MIME>
+
+  <MIME mime="audio/xaiff" handler="SEND" param="">
+    <EXTENSION value="aif"/>
+    <EXTENSION value="aifc"/>
+    <EXTENSION value="aiff"/>
+  </MIME>
+
+  <MIME mime="application/xdvi" handler="SEND" param="">
+    <EXTENSION value="dvi"/>
+  </MIME>
+
+  <MIME mime="application/andrewinset" handler="SEND" param="">
+    <EXTENSION value="ez"/>
+  </MIME>
+
+  <MIME mime="application/xnetcdf" handler="SEND" param="">
+    <EXTENSION value="cdf"/>
+    <EXTENSION value="nc"/>
+  </MIME>
+
+  <MIME mime="application/xsv4cpio" handler="SEND" param="">
+    <EXTENSION value="sv4cpio"/>
+  </MIME>
+
+  <MIME mime="video/xsgimovie" handler="SEND" param="">
+    <EXTENSION value="movie"/>
+  </MIME>
+
+  <MIME mime="audio/mpeg" handler="SEND" param="">
+    <EXTENSION value="mp2"/>
+    <EXTENSION value="mp3"/>
+    <EXTENSION value="mpga"/>
+  </MIME>
+
+  <MIME mime="application/xtroffme" handler="SEND" param="">
+    <EXTENSION value="me"/>
+  </MIME>
+
+  <MIME mime="xconference/xcooltalk" handler="SEND" param="">
+    <EXTENSION value="ice"/>
+  </MIME>
+
+  <MIME mime="application/octetstream" handler="SEND" param="">
+    <EXTENSION value="bin"/>
+    <EXTENSION value="class"/>
+    <EXTENSION value="dms"/>
+    <EXTENSION value="exe"/>
+    <EXTENSION value="lha"/>
+    <EXTENSION value="lzh"/>
+  </MIME>
+
+  <MIME mime="application/xtroffms" handler="SEND" param="">
+    <EXTENSION value="ms"/>
+  </MIME>
+
+  <MIME mime="application/xgzip" handler="SEND" param="">
+    <EXTENSION value="gz"/>
+  </MIME>
+
+  <MIME mime="audio/basic" handler="SEND" param="">
+    <EXTENSION value="au"/>
+    <EXTENSION value="snd"/>
+  </MIME>
+
+  <MIME mime="application/xtar" handler="SEND" param="">
+    <EXTENSION value="tar"/>
+  </MIME>
+
+  <MIME mime="text/rtf" handler="SEND" param="">
+    <EXTENSION value="rtf"/>
+  </MIME>
+
+  <MIME mime="text/richtext" handler="SEND" param="">
+    <EXTENSION value="rtx"/>
+  </MIME>
+
+  <MIME mime="image/xportableanymap" handler="SEND" param="">
+    <EXTENSION value="pnm"/>
+  </MIME>
+
+  <MIME mime="application/xchesspgn" handler="SEND" param="">
+    <EXTENSION value="pgn"/>
+  </MIME>
+
+  <MIME mime="video/xfli" handler="SEND" param="">
+    <EXTENSION value="fli"/>
+  </MIME>
+
+  <MIME mime="application/msword" handler="SEND" param="">
+    <EXTENSION value="doc"/>
+  </MIME>
+</MIMES>


Property changes on: trunk/myserver/binaries/MIMEtypes.default.xml
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Deleted: trunk/myserver/binaries/MIMEtypes.xml.default
===================================================================
--- trunk/myserver/binaries/MIMEtypes.xml.default       2009-03-01 17:57:42 UTC 
(rev 3017)
+++ trunk/myserver/binaries/MIMEtypes.xml.default       2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -1,503 +0,0 @@
-<?xml version="1.0"?>
-
-<MIMES>
-  <MIME mime="text/html" handler="MSCGI" param="">
-    <EXTENSION value="mscgi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="CGI" self="YES" param="">
-    <EXTENSION value="cgi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="ISAPI" param="">
-    <EXTENSION value="isapi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="SCGI" self="YES" param="">
-    <EXTENSION value="scgi"/>
-  </MIME>
-
-  <MIME mime="text/html" handler="FASTCGI" self="YES" param="">
-    <EXTENSION value="fcgi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="WINCGI" param="">
-    <EXTENSION value="wincgi"/>
-  </MIME>
-
-
-  <MIME mime="application/postscript" handler="SEND" param="">
-    <EXTENSION value="ai"/>
-    <EXTENSION value="eps"/>
-    <EXTENSION value="ps"/>
-  </MIME>
-  
-  <MIME mime="video/quicktime" handler="SEND" param="">
-    <EXTENSION value="mov"/>
-    <EXTENSION value="qt"/>
-  </MIME>
-
-  <MIME mime="image/png" handler="SEND" param="">
-    <EXTENSION value="png"/>
-  </MIME>
-
-  <MIME mime="video/vndvivo" handler="SEND" param="">
-    <EXTENSION value="viv"/>
-    <EXTENSION value="vivo"/>
-  </MIME>
-
-  <MIME mime="application/xtex" handler="SEND" param="">
-    <EXTENSION value="tex"/>
-  </MIME>
-
-  <MIME mime="text/xsetext" handler="SEND" param="">
-    <EXTENSION value="etx"/>
-  </MIME>
-
-  <MIME mime="application/vda" handler="SEND" param="">
-    <EXTENSION value="vda"/>
-  </MIME>
-
-  <MIME mime="application/dsptype" handler="SEND" param="">
-    <EXTENSION value="tsp"/>
-  </MIME>
-
-  <MIME mime="application/xstuffit" handler="SEND" param="">
-    <EXTENSION value="sit"/>
-  </MIME>
-
-  <MIME mime="application/solids" handler="SEND" param="">
-    <EXTENSION value="sol"/>
-  </MIME>
-
-  <MIME mime="application/xfuturesplash" handler="SEND" param="">
-    <EXTENSION value="spl"/>
-  </MIME>
-
-  <MIME mime="application/xbcpio" handler="SEND" param="">
-    <EXTENSION value="bcpio"/>
-  </MIME>
-
-  <MIME mime="application/oda" handler="SEND" param="">
-    <EXTENSION value="oda"/>
-  </MIME>
-
-  <MIME mime="application/pro_eng" handler="SEND" param="">
-    <EXTENSION value="prt"/>
-  </MIME>
-
-  <MIME mime="model/iges" handler="SEND" param="">
-    <EXTENSION value="iges"/>
-    <EXTENSION value="igs"/>
-  </MIME>
-
-  <MIME mime="audio/TSPaudio" handler="SEND" param="">
-    <EXTENSION value="tsi"/>
-  </MIME>
-
-  <MIME mime="image/xportablegraymap" handler="SEND" param="">
-    <EXTENSION value="pgm"/>
-  </MIME>
-
-  <MIME mime="application/xlatex" handler="SEND" param="">
-    <EXTENSION value="latex"/>
-  </MIME>
-
-  <MIME mime="application/xsh" handler="SEND" param="">
-    <EXTENSION value="sh"/>
-  </MIME>
-
-  <MIME mime="application/drafting" handler="SEND" param="">
-    <EXTENSION value="drw"/>
-  </MIME>
-
-  <MIME mime="text/html" handler="SEND" param="">
-    <EXTENSION value="htm"/>
-    <EXTENSION value="html"/>
-  </MIME>
-
-  <MIME mime="application/smil" handler="SEND" param="">
-    <EXTENSION value="smi"/>
-    <EXTENSION value="smil"/>
-  </MIME>
-
-  <MIME mime="application/vndmif" handler="SEND" param="">
-    <EXTENSION value="mif"/>
-  </MIME>
-
-  <MIME mime="application/xipix" handler="SEND" param="">
-    <EXTENSION value="ipx"/>
-  </MIME>
-
-  <MIME mime="model/mesh" handler="SEND" param="">
-    <EXTENSION value="mesh"/>
-    <EXTENSION value="msh"/>
-    <EXTENSION value="silo"/>
-  </MIME>
-
-  <MIME mime="application/xtroffman" handler="SEND" param="">
-    <EXTENSION value="man"/>
-  </MIME>
-
-  <MIME mime="application/xcsh" handler="SEND" param="">
-    <EXTENSION value="csh"/>
-  </MIME>
-
-  <MIME mime="audio/xpnrealaudioplugin" handler="SEND" param="">
-    <EXTENSION value="rpm"/>
-  </MIME>
-
-  <MIME mime="image/cmuraster" handler="SEND" param="">
-    <EXTENSION value="ras"/>
-  </MIME>
-
-  <MIME mime="www/mime" handler="SEND" param="">
-    <EXTENSION value="mime"/>
-  </MIME>
-
-  <MIME mime="application/xdirector" handler="SEND" param="">
-    <EXTENSION value="dcr"/>
-    <EXTENSION value="dir"/>
-    <EXTENSION value="dxr"/>
-  </MIME>
-
-  <MIME mime="text/xml" handler="SEND" param="">
-    <EXTENSION value="xml"/>
-  </MIME>
-
-  <MIME mime="application/xfreelance" handler="SEND" param="">
-    <EXTENSION value="pre"/>
-  </MIME>
-
-  <MIME mime="image/ief" handler="SEND" param="">
-    <EXTENSION value="ief"/>
-  </MIME>
-
-  <MIME mime="application/xshar" handler="SEND" param="">
-    <EXTENSION value="shar"/>
-  </MIME>
-
-  <MIME mime="audio/xrealaudio" handler="SEND" param="">
-    <EXTENSION value="ra"/>
-  </MIME>
-
-  <MIME mime="application/mspowerpoint" handler="SEND" param="">
-    <EXTENSION value="pot"/>
-    <EXTENSION value="pps"/>
-    <EXTENSION value="ppt"/>
-    <EXTENSION value="ppz"/>
-  </MIME>
-
-  <MIME mime="audio/midi" handler="SEND" param="">
-    <EXTENSION value="kar"/>
-    <EXTENSION value="mid"/>
-    <EXTENSION value="midi"/>
-  </MIME>
-
-  <MIME mime="image/jpeg" handler="SEND" param="">
-    <EXTENSION value="jpe"/>
-    <EXTENSION value="jpeg"/>
-    <EXTENSION value="jpg"/>
-  </MIME>
-
-  <MIME mime="application/xkoan" handler="SEND" param="">
-    <EXTENSION value="skd"/>
-    <EXTENSION value="skm"/>
-    <EXTENSION value="skp"/>
-    <EXTENSION value="skt"/>
-  </MIME>
-
-  <MIME mime="application/SLA" handler="SEND" param="">
-    <EXTENSION value="stl"/>
-  </MIME>
-
-  <MIME mime="application/STEP" handler="SEND" param="">
-    <EXTENSION value="step"/>
-    <EXTENSION value="stp"/>
-  </MIME>
-
-  <MIME mime="application/xshockwaveflash" handler="SEND" param="">
-    <EXTENSION value="swf"/>
-  </MIME>
-
-  <MIME mime="image/xxwindowdump" handler="SEND" param="">
-    <EXTENSION value="xwd"/>
-  </MIME>
-
-  <MIME mime="image/xxbitmap" handler="SEND" param="">
-    <EXTENSION value="xbm"/>
-  </MIME>
-
-  <MIME mime="application/dxf" handler="SEND" param="">
-    <EXTENSION value="dxf"/>
-  </MIME>
-
-  <MIME mime="text/sgml" handler="SEND" param="">
-    <EXTENSION value="sgm"/>
-    <EXTENSION value="sgml"/>
-  </MIME>
-
-  <MIME mime="model/vrml" handler="SEND" param="">
-    <EXTENSION value="vrml"/>
-    <EXTENSION value="wrl"/>
-  </MIME>
-
-  <MIME mime="application/xipscript" handler="SEND" param="">
-    <EXTENSION value="ips"/>
-  </MIME>
-
-  <MIME mime="image/xportablepixmap" handler="SEND" param="">
-    <EXTENSION value="ppm"/>
-  </MIME>
-
-  <MIME mime="text/plain" handler="SEND" param="">
-    <EXTENSION value="asc"/>
-    <EXTENSION value="c"/>
-    <EXTENSION value="cc"/>
-    <EXTENSION value="f"/>
-    <EXTENSION value="f90"/>
-    <EXTENSION value="h"/>
-    <EXTENSION value="hh"/>
-    <EXTENSION value="m"/>
-    <EXTENSION value="txt"/>
-  </MIME>
-
-  <MIME mime="application/set" handler="SEND" param="">
-    <EXTENSION value="set"/>
-  </MIME>
-
-  <MIME mime="video/xmsvideo" handler="SEND" param="">
-    <EXTENSION value="avi"/>
-  </MIME>
-
-  <MIME mime="audio/xwav" handler="SEND" param="">
-    <EXTENSION value="wav"/>
-  </MIME>
-
-  <MIME mime="application/xgtar" handler="SEND" param="">
-    <EXTENSION value="gtar"/>
-  </MIME>
-
-  <MIME mime="application/xwaissource" handler="SEND" param="">
-    <EXTENSION value="src"/>
-  </MIME>
-
-  <MIME mime="application/acad" handler="SEND" param="">
-    <EXTENSION value="dwg"/>
-  </MIME>
-
-  <MIME mime="application/xlisp" handler="SEND" param="">
-    <EXTENSION value="lsp"/>
-  </MIME>
-
-  <MIME mime="application/zip" handler="SEND" param="">
-    <EXTENSION value="zip"/>
-  </MIME>
-
-  <MIME mime="audio/xpnrealaudio" handler="SEND" param="">
-    <EXTENSION value="ram"/>
-    <EXTENSION value="rm"/>
-  </MIME>
-
-  <MIME mime="text/tabseparatedvalues" handler="SEND" param="">
-    <EXTENSION value="tsv"/>
-  </MIME>
-
-  <MIME mime="image/xxpixmap" handler="SEND" param="">
-    <EXTENSION value="xpm"/>
-  </MIME>
-
-  <MIME mime="application/xtexinfo" handler="SEND" param="">
-    <EXTENSION value="texi"/>
-    <EXTENSION value="texinfo"/>
-  </MIME>
-
-  <MIME mime="application/xustar" handler="SEND" param="">
-    <EXTENSION value="ustar"/>
-  </MIME>
-
-  <MIME mime="application/xcpio" handler="SEND" param="">
-    <EXTENSION value="cpio"/>
-  </MIME>
-
-  <MIME mime="application/vndmsexcel" handler="SEND" param="">
-    <EXTENSION value="xlc"/>
-    <EXTENSION value="xll"/>
-    <EXTENSION value="xlm"/>
-    <EXTENSION value="xls"/>
-    <EXTENSION value="xlw"/>
-  </MIME>
-
-  <MIME mime="image/xrgb" handler="SEND" param="">
-    <EXTENSION value="rgb"/>
-  </MIME>
-
-  <MIME mime="image/xportablebitmap" handler="SEND" param="">
-    <EXTENSION value="pbm"/>
-  </MIME>
-
-  <MIME mime="application/pdf" handler="SEND" param="">
-    <EXTENSION value="pdf"/>
-  </MIME>
-
-  <MIME mime="application/xjavascript" handler="SEND" param="">
-    <EXTENSION value="js"/>
-  </MIME>
-
-  <MIME mime="application/xcdlink" handler="SEND" param="">
-    <EXTENSION value="vcd"/>
-  </MIME>
-
-  <MIME mime="chemical/xpdb" handler="SEND" param="">
-    <EXTENSION value="pdb"/>
-    <EXTENSION value="xyz"/>
-  </MIME>
-
-  <MIME mime="application/xsv4crc" handler="SEND" param="">
-    <EXTENSION value="sv4crc"/>
-  </MIME>
-
-  <MIME mime="image/gif" handler="SEND" param="">
-    <EXTENSION value="gif"/>
-  </MIME>
-
-  <MIME mime="application/xlotusscreencam" handler="SEND" param="">
-    <EXTENSION value="scm"/>
-  </MIME>
-
-  <MIME mime="image/tiff" handler="SEND" param="">
-    <EXTENSION value="tif"/>
-    <EXTENSION value="tiff"/>
-  </MIME>
-
-  <MIME mime="application/maccompactpro" handler="SEND" param="">
-    <EXTENSION value="cpt"/>
-  </MIME>
-
-  <MIME mime="application/clariscad" handler="SEND" param="">
-    <EXTENSION value="ccad"/>
-  </MIME>
-
-  <MIME mime="video/mpeg" handler="SEND" param="">
-    <EXTENSION value="mpe"/>
-    <EXTENSION value="mpeg"/>
-    <EXTENSION value="mpg"/>
-  </MIME>
-
-  <MIME mime="application/xtcl" handler="SEND" param="">
-    <EXTENSION value="tcl"/>
-  </MIME>
-
-  <MIME mime="application/xhdf" handler="SEND" param="">
-    <EXTENSION value="hdf"/>
-  </MIME>
-
-  <MIME mime="text/css" handler="SEND" param="">
-    <EXTENSION value="css"/>
-  </MIME>
-
-  <MIME mime="application/xtroff" handler="SEND" param="">
-    <EXTENSION value="roff"/>
-    <EXTENSION value="t"/>
-    <EXTENSION value="tr"/>
-  </MIME>
-
-  <MIME mime="application/macbinhex40" handler="SEND" param="">
-    <EXTENSION value="hqx"/>
-  </MIME>
-
-  <MIME mime="application/ideas" handler="SEND" param="">
-    <EXTENSION value="unv"/>
-  </MIME>
-
-  <MIME mime="audio/xaiff" handler="SEND" param="">
-    <EXTENSION value="aif"/>
-    <EXTENSION value="aifc"/>
-    <EXTENSION value="aiff"/>
-  </MIME>
-
-  <MIME mime="application/xdvi" handler="SEND" param="">
-    <EXTENSION value="dvi"/>
-  </MIME>
-
-  <MIME mime="application/andrewinset" handler="SEND" param="">
-    <EXTENSION value="ez"/>
-  </MIME>
-
-  <MIME mime="application/xnetcdf" handler="SEND" param="">
-    <EXTENSION value="cdf"/>
-    <EXTENSION value="nc"/>
-  </MIME>
-
-  <MIME mime="application/xsv4cpio" handler="SEND" param="">
-    <EXTENSION value="sv4cpio"/>
-  </MIME>
-
-  <MIME mime="video/xsgimovie" handler="SEND" param="">
-    <EXTENSION value="movie"/>
-  </MIME>
-
-  <MIME mime="audio/mpeg" handler="SEND" param="">
-    <EXTENSION value="mp2"/>
-    <EXTENSION value="mp3"/>
-    <EXTENSION value="mpga"/>
-  </MIME>
-
-  <MIME mime="application/xtroffme" handler="SEND" param="">
-    <EXTENSION value="me"/>
-  </MIME>
-
-  <MIME mime="xconference/xcooltalk" handler="SEND" param="">
-    <EXTENSION value="ice"/>
-  </MIME>
-
-  <MIME mime="application/octetstream" handler="SEND" param="">
-    <EXTENSION value="bin"/>
-    <EXTENSION value="class"/>
-    <EXTENSION value="dms"/>
-    <EXTENSION value="exe"/>
-    <EXTENSION value="lha"/>
-    <EXTENSION value="lzh"/>
-  </MIME>
-
-  <MIME mime="application/xtroffms" handler="SEND" param="">
-    <EXTENSION value="ms"/>
-  </MIME>
-
-  <MIME mime="application/xgzip" handler="SEND" param="">
-    <EXTENSION value="gz"/>
-  </MIME>
-
-  <MIME mime="audio/basic" handler="SEND" param="">
-    <EXTENSION value="au"/>
-    <EXTENSION value="snd"/>
-  </MIME>
-
-  <MIME mime="application/xtar" handler="SEND" param="">
-    <EXTENSION value="tar"/>
-  </MIME>
-
-  <MIME mime="text/rtf" handler="SEND" param="">
-    <EXTENSION value="rtf"/>
-  </MIME>
-
-  <MIME mime="text/richtext" handler="SEND" param="">
-    <EXTENSION value="rtx"/>
-  </MIME>
-
-  <MIME mime="image/xportableanymap" handler="SEND" param="">
-    <EXTENSION value="pnm"/>
-  </MIME>
-
-  <MIME mime="application/xchesspgn" handler="SEND" param="">
-    <EXTENSION value="pgn"/>
-  </MIME>
-
-  <MIME mime="video/xfli" handler="SEND" param="">
-    <EXTENSION value="fli"/>
-  </MIME>
-
-  <MIME mime="application/msword" handler="SEND" param="">
-    <EXTENSION value="doc"/>
-  </MIME>
-</MIMES>

Deleted: trunk/myserver/binaries/MIMEtypes.xml.unix.default
===================================================================
--- trunk/myserver/binaries/MIMEtypes.xml.unix.default  2009-03-01 17:57:42 UTC 
(rev 3017)
+++ trunk/myserver/binaries/MIMEtypes.xml.unix.default  2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -1,503 +0,0 @@
-<?xml version="1.0"?>
-
-<MIMES>
-  <MIME mime="text/html" handler="MSCGI" param="">
-    <EXTENSION value="mscgi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="CGI" self="YES" param="">
-    <EXTENSION value="cgi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="ISAPI" param="">
-    <EXTENSION value="isapi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="SCGI" self="YES" param="">
-    <EXTENSION value="scgi"/>
-  </MIME>
-
-  <MIME mime="text/html" handler="FASTCGI" self="YES" param="">
-    <EXTENSION value="fcgi"/>
-  </MIME>
-  
-  <MIME mime="text/html" handler="WINCGI" param="">
-    <EXTENSION value="wincgi"/>
-  </MIME>
-
-
-  <MIME mime="application/postscript" handler="SEND" param="">
-    <EXTENSION value="ai"/>
-    <EXTENSION value="eps"/>
-    <EXTENSION value="ps"/>
-  </MIME>
-  
-  <MIME mime="video/quicktime" handler="SEND" param="">
-    <EXTENSION value="mov"/>
-    <EXTENSION value="qt"/>
-  </MIME>
-
-  <MIME mime="image/png" handler="SEND" param="">
-    <EXTENSION value="png"/>
-  </MIME>
-
-  <MIME mime="video/vndvivo" handler="SEND" param="">
-    <EXTENSION value="viv"/>
-    <EXTENSION value="vivo"/>
-  </MIME>
-
-  <MIME mime="application/xtex" handler="SEND" param="">
-    <EXTENSION value="tex"/>
-  </MIME>
-
-  <MIME mime="text/xsetext" handler="SEND" param="">
-    <EXTENSION value="etx"/>
-  </MIME>
-
-  <MIME mime="application/vda" handler="SEND" param="">
-    <EXTENSION value="vda"/>
-  </MIME>
-
-  <MIME mime="application/dsptype" handler="SEND" param="">
-    <EXTENSION value="tsp"/>
-  </MIME>
-
-  <MIME mime="application/xstuffit" handler="SEND" param="">
-    <EXTENSION value="sit"/>
-  </MIME>
-
-  <MIME mime="application/solids" handler="SEND" param="">
-    <EXTENSION value="sol"/>
-  </MIME>
-
-  <MIME mime="application/xfuturesplash" handler="SEND" param="">
-    <EXTENSION value="spl"/>
-  </MIME>
-
-  <MIME mime="application/xbcpio" handler="SEND" param="">
-    <EXTENSION value="bcpio"/>
-  </MIME>
-
-  <MIME mime="application/oda" handler="SEND" param="">
-    <EXTENSION value="oda"/>
-  </MIME>
-
-  <MIME mime="application/pro_eng" handler="SEND" param="">
-    <EXTENSION value="prt"/>
-  </MIME>
-
-  <MIME mime="model/iges" handler="SEND" param="">
-    <EXTENSION value="iges"/>
-    <EXTENSION value="igs"/>
-  </MIME>
-
-  <MIME mime="audio/TSPaudio" handler="SEND" param="">
-    <EXTENSION value="tsi"/>
-  </MIME>
-
-  <MIME mime="image/xportablegraymap" handler="SEND" param="">
-    <EXTENSION value="pgm"/>
-  </MIME>
-
-  <MIME mime="application/xlatex" handler="SEND" param="">
-    <EXTENSION value="latex"/>
-  </MIME>
-
-  <MIME mime="application/xsh" handler="SEND" param="">
-    <EXTENSION value="sh"/>
-  </MIME>
-
-  <MIME mime="application/drafting" handler="SEND" param="">
-    <EXTENSION value="drw"/>
-  </MIME>
-
-  <MIME mime="text/html" handler="SEND" param="">
-    <EXTENSION value="htm"/>
-    <EXTENSION value="html"/>
-  </MIME>
-
-  <MIME mime="application/smil" handler="SEND" param="">
-    <EXTENSION value="smi"/>
-    <EXTENSION value="smil"/>
-  </MIME>
-
-  <MIME mime="application/vndmif" handler="SEND" param="">
-    <EXTENSION value="mif"/>
-  </MIME>
-
-  <MIME mime="application/xipix" handler="SEND" param="">
-    <EXTENSION value="ipx"/>
-  </MIME>
-
-  <MIME mime="model/mesh" handler="SEND" param="">
-    <EXTENSION value="mesh"/>
-    <EXTENSION value="msh"/>
-    <EXTENSION value="silo"/>
-  </MIME>
-
-  <MIME mime="application/xtroffman" handler="SEND" param="">
-    <EXTENSION value="man"/>
-  </MIME>
-
-  <MIME mime="application/xcsh" handler="SEND" param="">
-    <EXTENSION value="csh"/>
-  </MIME>
-
-  <MIME mime="audio/xpnrealaudioplugin" handler="SEND" param="">
-    <EXTENSION value="rpm"/>
-  </MIME>
-
-  <MIME mime="image/cmuraster" handler="SEND" param="">
-    <EXTENSION value="ras"/>
-  </MIME>
-
-  <MIME mime="www/mime" handler="SEND" param="">
-    <EXTENSION value="mime"/>
-  </MIME>
-
-  <MIME mime="application/xdirector" handler="SEND" param="">
-    <EXTENSION value="dcr"/>
-    <EXTENSION value="dir"/>
-    <EXTENSION value="dxr"/>
-  </MIME>
-
-  <MIME mime="text/xml" handler="SEND" param="">
-    <EXTENSION value="xml"/>
-  </MIME>
-
-  <MIME mime="application/xfreelance" handler="SEND" param="">
-    <EXTENSION value="pre"/>
-  </MIME>
-
-  <MIME mime="image/ief" handler="SEND" param="">
-    <EXTENSION value="ief"/>
-  </MIME>
-
-  <MIME mime="application/xshar" handler="SEND" param="">
-    <EXTENSION value="shar"/>
-  </MIME>
-
-  <MIME mime="audio/xrealaudio" handler="SEND" param="">
-    <EXTENSION value="ra"/>
-  </MIME>
-
-  <MIME mime="application/mspowerpoint" handler="SEND" param="">
-    <EXTENSION value="pot"/>
-    <EXTENSION value="pps"/>
-    <EXTENSION value="ppt"/>
-    <EXTENSION value="ppz"/>
-  </MIME>
-
-  <MIME mime="audio/midi" handler="SEND" param="">
-    <EXTENSION value="kar"/>
-    <EXTENSION value="mid"/>
-    <EXTENSION value="midi"/>
-  </MIME>
-
-  <MIME mime="image/jpeg" handler="SEND" param="">
-    <EXTENSION value="jpe"/>
-    <EXTENSION value="jpeg"/>
-    <EXTENSION value="jpg"/>
-  </MIME>
-
-  <MIME mime="application/xkoan" handler="SEND" param="">
-    <EXTENSION value="skd"/>
-    <EXTENSION value="skm"/>
-    <EXTENSION value="skp"/>
-    <EXTENSION value="skt"/>
-  </MIME>
-
-  <MIME mime="application/SLA" handler="SEND" param="">
-    <EXTENSION value="stl"/>
-  </MIME>
-
-  <MIME mime="application/STEP" handler="SEND" param="">
-    <EXTENSION value="step"/>
-    <EXTENSION value="stp"/>
-  </MIME>
-
-  <MIME mime="application/xshockwaveflash" handler="SEND" param="">
-    <EXTENSION value="swf"/>
-  </MIME>
-
-  <MIME mime="image/xxwindowdump" handler="SEND" param="">
-    <EXTENSION value="xwd"/>
-  </MIME>
-
-  <MIME mime="image/xxbitmap" handler="SEND" param="">
-    <EXTENSION value="xbm"/>
-  </MIME>
-
-  <MIME mime="application/dxf" handler="SEND" param="">
-    <EXTENSION value="dxf"/>
-  </MIME>
-
-  <MIME mime="text/sgml" handler="SEND" param="">
-    <EXTENSION value="sgm"/>
-    <EXTENSION value="sgml"/>
-  </MIME>
-
-  <MIME mime="model/vrml" handler="SEND" param="">
-    <EXTENSION value="vrml"/>
-    <EXTENSION value="wrl"/>
-  </MIME>
-
-  <MIME mime="application/xipscript" handler="SEND" param="">
-    <EXTENSION value="ips"/>
-  </MIME>
-
-  <MIME mime="image/xportablepixmap" handler="SEND" param="">
-    <EXTENSION value="ppm"/>
-  </MIME>
-
-  <MIME mime="text/plain" handler="SEND" param="">
-    <EXTENSION value="asc"/>
-    <EXTENSION value="c"/>
-    <EXTENSION value="cc"/>
-    <EXTENSION value="f"/>
-    <EXTENSION value="f90"/>
-    <EXTENSION value="h"/>
-    <EXTENSION value="hh"/>
-    <EXTENSION value="m"/>
-    <EXTENSION value="txt"/>
-  </MIME>
-
-  <MIME mime="application/set" handler="SEND" param="">
-    <EXTENSION value="set"/>
-  </MIME>
-
-  <MIME mime="video/xmsvideo" handler="SEND" param="">
-    <EXTENSION value="avi"/>
-  </MIME>
-
-  <MIME mime="audio/xwav" handler="SEND" param="">
-    <EXTENSION value="wav"/>
-  </MIME>
-
-  <MIME mime="application/xgtar" handler="SEND" param="">
-    <EXTENSION value="gtar"/>
-  </MIME>
-
-  <MIME mime="application/xwaissource" handler="SEND" param="">
-    <EXTENSION value="src"/>
-  </MIME>
-
-  <MIME mime="application/acad" handler="SEND" param="">
-    <EXTENSION value="dwg"/>
-  </MIME>
-
-  <MIME mime="application/xlisp" handler="SEND" param="">
-    <EXTENSION value="lsp"/>
-  </MIME>
-
-  <MIME mime="application/zip" handler="SEND" param="">
-    <EXTENSION value="zip"/>
-  </MIME>
-
-  <MIME mime="audio/xpnrealaudio" handler="SEND" param="">
-    <EXTENSION value="ram"/>
-    <EXTENSION value="rm"/>
-  </MIME>
-
-  <MIME mime="text/tabseparatedvalues" handler="SEND" param="">
-    <EXTENSION value="tsv"/>
-  </MIME>
-
-  <MIME mime="image/xxpixmap" handler="SEND" param="">
-    <EXTENSION value="xpm"/>
-  </MIME>
-
-  <MIME mime="application/xtexinfo" handler="SEND" param="">
-    <EXTENSION value="texi"/>
-    <EXTENSION value="texinfo"/>
-  </MIME>
-
-  <MIME mime="application/xustar" handler="SEND" param="">
-    <EXTENSION value="ustar"/>
-  </MIME>
-
-  <MIME mime="application/xcpio" handler="SEND" param="">
-    <EXTENSION value="cpio"/>
-  </MIME>
-
-  <MIME mime="application/vndmsexcel" handler="SEND" param="">
-    <EXTENSION value="xlc"/>
-    <EXTENSION value="xll"/>
-    <EXTENSION value="xlm"/>
-    <EXTENSION value="xls"/>
-    <EXTENSION value="xlw"/>
-  </MIME>
-
-  <MIME mime="image/xrgb" handler="SEND" param="">
-    <EXTENSION value="rgb"/>
-  </MIME>
-
-  <MIME mime="image/xportablebitmap" handler="SEND" param="">
-    <EXTENSION value="pbm"/>
-  </MIME>
-
-  <MIME mime="application/pdf" handler="SEND" param="">
-    <EXTENSION value="pdf"/>
-  </MIME>
-
-  <MIME mime="application/xjavascript" handler="SEND" param="">
-    <EXTENSION value="js"/>
-  </MIME>
-
-  <MIME mime="application/xcdlink" handler="SEND" param="">
-    <EXTENSION value="vcd"/>
-  </MIME>
-
-  <MIME mime="chemical/xpdb" handler="SEND" param="">
-    <EXTENSION value="pdb"/>
-    <EXTENSION value="xyz"/>
-  </MIME>
-
-  <MIME mime="application/xsv4crc" handler="SEND" param="">
-    <EXTENSION value="sv4crc"/>
-  </MIME>
-
-  <MIME mime="image/gif" handler="SEND" param="">
-    <EXTENSION value="gif"/>
-  </MIME>
-
-  <MIME mime="application/xlotusscreencam" handler="SEND" param="">
-    <EXTENSION value="scm"/>
-  </MIME>
-
-  <MIME mime="image/tiff" handler="SEND" param="">
-    <EXTENSION value="tif"/>
-    <EXTENSION value="tiff"/>
-  </MIME>
-
-  <MIME mime="application/maccompactpro" handler="SEND" param="">
-    <EXTENSION value="cpt"/>
-  </MIME>
-
-  <MIME mime="application/clariscad" handler="SEND" param="">
-    <EXTENSION value="ccad"/>
-  </MIME>
-
-  <MIME mime="video/mpeg" handler="SEND" param="">
-    <EXTENSION value="mpe"/>
-    <EXTENSION value="mpeg"/>
-    <EXTENSION value="mpg"/>
-  </MIME>
-
-  <MIME mime="application/xtcl" handler="SEND" param="">
-    <EXTENSION value="tcl"/>
-  </MIME>
-
-  <MIME mime="application/xhdf" handler="SEND" param="">
-    <EXTENSION value="hdf"/>
-  </MIME>
-
-  <MIME mime="text/css" handler="SEND" param="">
-    <EXTENSION value="css"/>
-  </MIME>
-
-  <MIME mime="application/xtroff" handler="SEND" param="">
-    <EXTENSION value="roff"/>
-    <EXTENSION value="t"/>
-    <EXTENSION value="tr"/>
-  </MIME>
-
-  <MIME mime="application/macbinhex40" handler="SEND" param="">
-    <EXTENSION value="hqx"/>
-  </MIME>
-
-  <MIME mime="application/ideas" handler="SEND" param="">
-    <EXTENSION value="unv"/>
-  </MIME>
-
-  <MIME mime="audio/xaiff" handler="SEND" param="">
-    <EXTENSION value="aif"/>
-    <EXTENSION value="aifc"/>
-    <EXTENSION value="aiff"/>
-  </MIME>
-
-  <MIME mime="application/xdvi" handler="SEND" param="">
-    <EXTENSION value="dvi"/>
-  </MIME>
-
-  <MIME mime="application/andrewinset" handler="SEND" param="">
-    <EXTENSION value="ez"/>
-  </MIME>
-
-  <MIME mime="application/xnetcdf" handler="SEND" param="">
-    <EXTENSION value="cdf"/>
-    <EXTENSION value="nc"/>
-  </MIME>
-
-  <MIME mime="application/xsv4cpio" handler="SEND" param="">
-    <EXTENSION value="sv4cpio"/>
-  </MIME>
-
-  <MIME mime="video/xsgimovie" handler="SEND" param="">
-    <EXTENSION value="movie"/>
-  </MIME>
-
-  <MIME mime="audio/mpeg" handler="SEND" param="">
-    <EXTENSION value="mp2"/>
-    <EXTENSION value="mp3"/>
-    <EXTENSION value="mpga"/>
-  </MIME>
-
-  <MIME mime="application/xtroffme" handler="SEND" param="">
-    <EXTENSION value="me"/>
-  </MIME>
-
-  <MIME mime="xconference/xcooltalk" handler="SEND" param="">
-    <EXTENSION value="ice"/>
-  </MIME>
-
-  <MIME mime="application/octetstream" handler="SEND" param="">
-    <EXTENSION value="bin"/>
-    <EXTENSION value="class"/>
-    <EXTENSION value="dms"/>
-    <EXTENSION value="exe"/>
-    <EXTENSION value="lha"/>
-    <EXTENSION value="lzh"/>
-  </MIME>
-
-  <MIME mime="application/xtroffms" handler="SEND" param="">
-    <EXTENSION value="ms"/>
-  </MIME>
-
-  <MIME mime="application/xgzip" handler="SEND" param="">
-    <EXTENSION value="gz"/>
-  </MIME>
-
-  <MIME mime="audio/basic" handler="SEND" param="">
-    <EXTENSION value="au"/>
-    <EXTENSION value="snd"/>
-  </MIME>
-
-  <MIME mime="application/xtar" handler="SEND" param="">
-    <EXTENSION value="tar"/>
-  </MIME>
-
-  <MIME mime="text/rtf" handler="SEND" param="">
-    <EXTENSION value="rtf"/>
-  </MIME>
-
-  <MIME mime="text/richtext" handler="SEND" param="">
-    <EXTENSION value="rtx"/>
-  </MIME>
-
-  <MIME mime="image/xportableanymap" handler="SEND" param="">
-    <EXTENSION value="pnm"/>
-  </MIME>
-
-  <MIME mime="application/xchesspgn" handler="SEND" param="">
-    <EXTENSION value="pgn"/>
-  </MIME>
-
-  <MIME mime="video/xfli" handler="SEND" param="">
-    <EXTENSION value="fli"/>
-  </MIME>
-
-  <MIME mime="application/msword" handler="SEND" param="">
-    <EXTENSION value="doc"/>
-  </MIME>
-</MIMES>

Modified: trunk/myserver/binaries/NSIS installer script.nsi
===================================================================
--- trunk/myserver/binaries/NSIS installer script.nsi   2009-03-01 17:57:42 UTC 
(rev 3017)
+++ trunk/myserver/binaries/NSIS installer script.nsi   2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -192,9 +192,9 @@
   WriteUninstaller "uninstall.exe"
   File "myserver.exe"
   File  "*.dll"
-  File "MIMEtypes.xml.default"
-  File "myserver.xml.default"
-  File "virtualhosts.xml.default"
+  File "MIMEtypes.default.windows.xml"
+  File "myserver.default.windows.xml"
+  File "virtualhosts.default.windows.xml"
   File "../README"
   File "../COPYING"
   CreateDirectory "$INSTDIR\logs"

Modified: trunk/myserver/binaries/clean_copy.sh
===================================================================
--- trunk/myserver/binaries/clean_copy.sh       2009-03-01 17:57:42 UTC (rev 
3017)
+++ trunk/myserver/binaries/clean_copy.sh       2009-03-01 18:35:31 UTC (rev 
3018)
@@ -9,7 +9,7 @@
 mkdir $1
 cp -v myserver $1
 cp -v myserver-daemon $1
-cp -v *.default $1
+cp -v *.default.xml $1
 cp -v ../COPYING $1
 cp -v ../INSTALL $1
 cp -v ../NEWS $1

Added: trunk/myserver/binaries/myserver.default.windows.xml
===================================================================
--- trunk/myserver/binaries/myserver.default.windows.xml                        
        (rev 0)
+++ trunk/myserver/binaries/myserver.default.windows.xml        2009-03-01 
18:35:31 UTC (rev 3018)
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+
+<!--MODIFY THE FILE ONLY IF YOU ARE SURE OF WHAT YOU ARE DOING-->
+<MYSERVER>
+
+       <!--CHOOSE THE LANGUAGE TO USE FOR THE SERVER-->
+       <DEFINE name="server.language" value="english.xml" />
+
+       <!--VERBOSITY ON LOG FILE-->
+       <DEFINE name="server.verbosity" value="2" />
+
+       <!--NUMBER OF SERVING THREADS ALWAYS ACTIVE-->
+  <DEFINE name="server.static_threads" value="5" />
+
+       <!--MAXIMUM NUMBER OF SERVING THREADS THAT THE SCHEDULER CAN
+                       CREATE-->
+       <DEFINE name="server.max_threads" value="200" />
+
+       <!--DIMENSION OF EVERY BUFFER IN BYTES IF ON THE MACHINE THERE IS A
+                       LOT OF RAM      THIS VALUES CAN BE INCREASED TO MAKE 
MYSERVER
+                       FASTER. NORMALLY THE MEMORY USED BY BUFFERS IS EQUAL TO
+                       BUFFER_SIZE * 2 * NUM_OF_THREADS-->
+       <DEFINE name="server.buffer_size" value="102400" />
+
+       <!--DEFAULT FILENAME TO SEND IN A DIRECTORY
+                       IF THE FILE ISN'T IN THE PATH THEN THE DIRECTORY
+                       CONTENT IS SENT -->
+       <DEFAULT_FILENAME>default.html</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>default.htm</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>default.php</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>index.html</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>index.htm</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>index.php</DEFAULT_FILENAME>
+
+       <!--TIMEOUT OF EVERY CLIENTS CONNECTED TO THE SERVER.
+                       IF THE CLIENT DOESN'T REQUEST ANYTHING FOR N
+                       SECONDS THE CONNECTION WITH THE CLIENT IS
+                       CLOSED. SET THIS TO 0 IF YOU DON'T WANT USE
+                       KEEP-ALIVE CONNECTIONS  -->
+       <DEFINE name="connection.timeout" value="60" />
+
+       <!--SET THIS TO YES FOR USE PERSONALIZED PAGES TO SEND MESSAGE,
+                       PERSONALIZED PAGES ARE IN THE SYSTEM DIRECTORY  -->
+       <DEFINE name="http.use_error_file" value="YES" />
+
+       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ALLOW TO THE SERVER. IF
+                       0 THEN INFINITE CONNECTIONS ARE ALLOWED.-->
+       <DEFINE name="server.max_connections" value="0" />
+
+       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ACCEPT.-->
+       <DEFINE name="server.max_accepted_connections" value="0" />
+
+  <!-- TEXT AND BACKGROUND ATTRIBUTES FOR CONSOLE LOG MESSAGES. -->
+  <CONSOLE_COLORS info_fg="white" info_bg="black" warning_fg="yellow" 
+                  warning_bg="black" error_fg="red" error_bg="black"/>
+
+       <!--MAX SIZE OF THE LOG FILE IN BYTES   -->
+       <DEFINE name="server.max_log_size" value="1048576" />
+
+       <!--DEFINE THE FOLDER BROWSING STYLE-->
+       <DEFINE name="http.dir.css" value="/sys/css/browsestyle.css" />
+
+       <!--DEFINE THE ADMINISTRATOR E-MAIL-->
+       <DEFINE name="server.admin" value="address@hidden" />
+
+       <!--DEFINE THE GZIP COMPRESSION THRESHOLD VALUE-->
+       <DEFINE name="gzip.threshold" value="1048576" />
+
+       <!--DEFINE IF LINKS SHOULD BE FOLLOWED-->
+       <DEFINE name="symlinks.follow" value="YES" />
+
+       <!--MAX CACHE SIZE FOR STATIC FILES-->
+       <DEFINE name="server.max_files_cache" value="10485760" />
+
+       <!--MAX CACHE SIZE FOR SINGLE STATIC FILE-->
+       <DEFINE name="server.max_file_cache" value="1048576" />
+
+       <!--MIN CACHE SIZE FOR SINGLE STATIC FILE-->
+       <DEFINE name="server.min_file_cache" value="1048576" />
+
+       <!-- ENABLE HOME DIRECTORY PER USER -->
+       <DEFINE name="http.use_home_directory" value="NO" />
+
+       <!-- DEFINE NAME FOR HOME DIRECTORY BROWSING, BY DEFAULT THE SERVER
+                        USES public_html -->
+       <DEFINE name="http.home_directory" value="public_html" />
+
+  <!--SET THIS TO YES IF YOU WANT TO ENABLE THE CONTROL PROTOCOL-->
+       <DEFINE name="control.enabled" value="NO" />
+
+       <!--MAXIMUM NUMBER OF EXTERNAL SERVERS THAT CAN BE EXECUTED-->
+       <DEFINE name="server.max_servers" value="100" />
+
+  <!--SET HERE THE NAME FOR THE CONTROL ADMIN. WE SUGGEST YOU YO USE
+      SOMETHING DIFFERENT FROM ADMIN, ADMINISTRATOR OR ROOT-->
+  <DEFINE name="control.admin" value="ADMIN" />
+
+  <!--DEFINE HERE A GOOD STRONG PASSWORD FOR THE ADMIN-->
+  <DEFINE name="control.password" value="PLEASE_CHANGE_THIS_PASSWORD" />
+
+  <!--FTP GLOBAL CONFIGURATION-->
+  <!--ALLOW ANONYMOUS LOGIN-->
+  <DEFINE name="ftp.allow_anonymous" value="NO" />
+
+  <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
+  <DEFINE name="ftp.anonymous_need_pass" value="NO" />
+
+  <!--ALLOW ASYNCHRONOUS CMDS LIKE Abor, Quit, Stat-->
+  <DEFINE name="ftp.allow_asynchronous_cmds" value="YES" />
+
+  <!--ALLOW CLIENTS TO SEND MORE THAN ONE COMMAND TO SERVER INTO ONE REQUEST-->
+  <DEFINE name="ftp.allow_pipelining" value="NO" />
+
+  <!--ALLOW CLIENTS TO CHANGE SERVER FILES-->
+  <DEFINE name="ftp.allow_store" value="NO" />
+</MYSERVER>


Property changes on: trunk/myserver/binaries/myserver.default.windows.xml
___________________________________________________________________
Added: svn:executable
   + *

Copied: trunk/myserver/binaries/myserver.default.xml (from rev 3017, 
trunk/myserver/binaries/myserver.xml.unix.default)
===================================================================
--- trunk/myserver/binaries/myserver.default.xml                                
(rev 0)
+++ trunk/myserver/binaries/myserver.default.xml        2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+
+<!--MODIFY THE FILE ONLY IF YOU ARE SURE OF WHAT YOU ARE DOING-->
+<MYSERVER>
+
+       <!--CHOOSE THE LANGUAGE TO USE FOR THE SERVER-->
+       <DEFINE name="server.language" value="english.xml" />
+
+       <!--VERBOSITY ON LOG FILE-->
+       <DEFINE name="server.verbosity" value="2" />
+
+       <!--NUMBER OF SERVING THREADS ALWAYS ACTIVE-->
+  <DEFINE name="server.static_threads" value="5" />
+
+       <!--MAXIMUM NUMBER OF SERVING THREADS THAT THE SCHEDULER CAN
+                       CREATE-->
+       <DEFINE name="server.max_threads" value="200" />
+
+       <!--DIMENSION OF EVERY BUFFER IN BYTES IF ON THE MACHINE THERE IS A
+                       LOT OF RAM      THIS VALUES CAN BE INCREASED TO MAKE 
MYSERVER
+                       FASTER. NORMALLY THE MEMORY USED BY BUFFERS IS EQUAL TO
+                       BUFFER_SIZE * 2 * NUM_OF_THREADS-->
+       <DEFINE name="server.buffer_size" value="102400" />
+
+       <!--DEFAULT FILENAME TO SEND IN A DIRECTORY
+                       IF THE FILE ISN'T IN THE PATH THEN THE DIRECTORY
+                       CONTENT IS SENT -->
+       <DEFAULT_FILENAME>default.html</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>default.htm</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>default.php</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>index.html</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>index.htm</DEFAULT_FILENAME>
+       <DEFAULT_FILENAME>index.php</DEFAULT_FILENAME>
+
+       <!--TIMEOUT OF EVERY CLIENTS CONNECTED TO THE SERVER.
+                       IF THE CLIENT DOESN'T REQUEST ANYTHING FOR N
+                       SECONDS THE CONNECTION WITH THE CLIENT IS
+                       CLOSED. SET THIS TO 0 IF YOU DON'T WANT USE
+                       KEEP-ALIVE CONNECTIONS  -->
+       <DEFINE name="connection.timeout" value="60" />
+
+       <!--SET THIS TO YES FOR USE PERSONALIZED PAGES TO SEND MESSAGE,
+                       PERSONALIZED PAGES ARE IN THE SYSTEM DIRECTORY  -->
+       <DEFINE name="http.use_error_file" value="YES" />
+
+       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ALLOW TO THE SERVER. IF
+                       0 THEN INFINITE CONNECTIONS ARE ALLOWED.-->
+       <DEFINE name="server.max_connections" value="0" />
+
+       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ACCEPT.-->
+       <DEFINE name="server.max_accepted_connections" value="0" />
+
+  <!-- TEXT AND BACKGROUND ATTRIBUTES FOR CONSOLE LOG MESSAGES. -->
+  <CONSOLE_COLORS info_fg="white" info_bg="black" warning_fg="yellow" 
+                  warning_bg="black" error_fg="red" error_bg="black"/>
+
+       <!--MAX SIZE OF THE LOG FILE IN BYTES   -->
+       <DEFINE name="server.max_log_size" value="1048576" />
+
+       <!--DEFINE THE FOLDER BROWSING STYLE-->
+       <DEFINE name="http.dir.css" value="/sys/css/browsestyle.css" />
+
+       <!--DEFINE THE ADMINISTRATOR E-MAIL-->
+       <DEFINE name="server.admin" value="address@hidden" />
+
+       <!--DEFINE THE GZIP COMPRESSION THRESHOLD VALUE-->
+       <DEFINE name="gzip.threshold" value="1048576" />
+
+       <!--DEFINE IF LINKS SHOULD BE FOLLOWED-->
+       <DEFINE name="symlinks.follow" value="YES" />
+
+       <!--MAX CACHE SIZE FOR STATIC FILES-->
+       <DEFINE name="server.max_files_cache" value="10485760" />
+
+       <!--MAX CACHE SIZE FOR SINGLE STATIC FILE-->
+       <DEFINE name="server.max_file_cache" value="1048576" />
+
+       <!--MIN CACHE SIZE FOR SINGLE STATIC FILE-->
+       <DEFINE name="server.min_file_cache" value="1048576" />
+
+       <!-- ENABLE HOME DIRECTORY PER USER -->
+       <DEFINE name="http.use_home_directory" value="NO" />
+
+       <!-- DEFINE NAME FOR HOME DIRECTORY BROWSING, BY DEFAULT THE SERVER
+                        USES public_html -->
+       <DEFINE name="http.home_directory" value="public_html" />
+
+  <!--SET THIS TO YES IF YOU WANT TO ENABLE THE CONTROL PROTOCOL-->
+       <DEFINE name="control.enabled" value="NO" />
+
+       <!--MAXIMUM NUMBER OF EXTERNAL SERVERS THAT CAN BE EXECUTED-->
+       <DEFINE name="server.max_servers" value="100" />
+
+  <!--SET HERE THE NAME FOR THE CONTROL ADMIN. WE SUGGEST YOU YO USE
+      SOMETHING DIFFERENT FROM ADMIN, ADMINISTRATOR OR ROOT-->
+  <DEFINE name="control.admin" value="ADMIN" />
+
+  <!--DEFINE HERE A GOOD STRONG PASSWORD FOR THE ADMIN-->
+  <DEFINE name="control.password" value="PLEASE_CHANGE_THIS_PASSWORD" />
+
+  <!--FTP GLOBAL CONFIGURATION-->
+  <!--ALLOW ANONYMOUS LOGIN-->
+  <DEFINE name="ftp.allow_anonymous" value="NO" />
+
+  <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
+  <DEFINE name="ftp.anonymous_need_pass" value="NO" />
+
+  <!--ALLOW ASYNCHRONOUS CMDS LIKE Abor, Quit, Stat-->
+  <DEFINE name="ftp.allow_asynchronous_cmds" value="YES" />
+
+  <!--ALLOW CLIENTS TO SEND MORE THAN ONE COMMAND TO SERVER INTO ONE REQUEST-->
+  <DEFINE name="ftp.allow_pipelining" value="NO" />
+
+  <!--ALLOW CLIENTS TO CHANGE SERVER FILES-->
+  <DEFINE name="ftp.allow_store" value="NO" />
+</MYSERVER>


Property changes on: trunk/myserver/binaries/myserver.default.xml
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Deleted: trunk/myserver/binaries/myserver.xml.default
===================================================================
--- trunk/myserver/binaries/myserver.xml.default        2009-03-01 17:57:42 UTC 
(rev 3017)
+++ trunk/myserver/binaries/myserver.xml.default        2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<!--MODIFY THE FILE ONLY IF YOU ARE SURE OF WHAT YOU ARE DOING-->
-<MYSERVER>
-
-       <!--CHOOSE THE LANGUAGE TO USE FOR THE SERVER-->
-       <DEFINE name="server.language" value="english.xml" />
-
-       <!--VERBOSITY ON LOG FILE-->
-       <DEFINE name="server.verbosity" value="2" />
-
-       <!--NUMBER OF SERVING THREADS ALWAYS ACTIVE-->
-  <DEFINE name="server.static_threads" value="5" />
-
-       <!--MAXIMUM NUMBER OF SERVING THREADS THAT THE SCHEDULER CAN
-                       CREATE-->
-       <DEFINE name="server.max_threads" value="200" />
-
-       <!--DIMENSION OF EVERY BUFFER IN BYTES IF ON THE MACHINE THERE IS A
-                       LOT OF RAM      THIS VALUES CAN BE INCREASED TO MAKE 
MYSERVER
-                       FASTER. NORMALLY THE MEMORY USED BY BUFFERS IS EQUAL TO
-                       BUFFER_SIZE * 2 * NUM_OF_THREADS-->
-       <DEFINE name="server.buffer_size" value="102400" />
-
-       <!--DEFAULT FILENAME TO SEND IN A DIRECTORY
-                       IF THE FILE ISN'T IN THE PATH THEN THE DIRECTORY
-                       CONTENT IS SENT -->
-       <DEFAULT_FILENAME>default.html</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>default.htm</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>default.php</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>index.html</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>index.htm</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>index.php</DEFAULT_FILENAME>
-
-       <!--TIMEOUT OF EVERY CLIENTS CONNECTED TO THE SERVER.
-                       IF THE CLIENT DOESN'T REQUEST ANYTHING FOR N
-                       SECONDS THE CONNECTION WITH THE CLIENT IS
-                       CLOSED. SET THIS TO 0 IF YOU DON'T WANT USE
-                       KEEP-ALIVE CONNECTIONS  -->
-       <DEFINE name="connection.timeout" value="60" />
-
-       <!--SET THIS TO YES FOR USE PERSONALIZED PAGES TO SEND MESSAGE,
-                       PERSONALIZED PAGES ARE IN THE SYSTEM DIRECTORY  -->
-       <DEFINE name="http.use_error_file" value="YES" />
-
-       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ALLOW TO THE SERVER. IF
-                       0 THEN INFINITE CONNECTIONS ARE ALLOWED.-->
-       <DEFINE name="server.max_connections" value="0" />
-
-       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ACCEPT.-->
-       <DEFINE name="server.max_accepted_connections" value="0" />
-
-  <!-- TEXT AND BACKGROUND ATTRIBUTES FOR CONSOLE LOG MESSAGES. -->
-  <CONSOLE_COLORS info_fg="white" info_bg="black" warning_fg="yellow" 
-                  warning_bg="black" error_fg="red" error_bg="black"/>
-
-       <!--MAX SIZE OF THE LOG FILE IN BYTES   -->
-       <DEFINE name="server.max_log_size" value="1048576" />
-
-       <!--DEFINE THE FOLDER BROWSING STYLE-->
-       <DEFINE name="http.dir.css" value="/sys/css/browsestyle.css" />
-
-       <!--DEFINE THE ADMINISTRATOR E-MAIL-->
-       <DEFINE name="server.admin" value="address@hidden" />
-
-       <!--DEFINE THE GZIP COMPRESSION THRESHOLD VALUE-->
-       <DEFINE name="gzip.threshold" value="1048576" />
-
-       <!--DEFINE IF LINKS SHOULD BE FOLLOWED-->
-       <DEFINE name="symlinks.follow" value="YES" />
-
-       <!--MAX CACHE SIZE FOR STATIC FILES-->
-       <DEFINE name="server.max_files_cache" value="10485760" />
-
-       <!--MAX CACHE SIZE FOR SINGLE STATIC FILE-->
-       <DEFINE name="server.max_file_cache" value="1048576" />
-
-       <!--MIN CACHE SIZE FOR SINGLE STATIC FILE-->
-       <DEFINE name="server.min_file_cache" value="1048576" />
-
-       <!-- ENABLE HOME DIRECTORY PER USER -->
-       <DEFINE name="http.use_home_directory" value="NO" />
-
-       <!-- DEFINE NAME FOR HOME DIRECTORY BROWSING, BY DEFAULT THE SERVER
-                        USES public_html -->
-       <DEFINE name="http.home_directory" value="public_html" />
-
-  <!--SET THIS TO YES IF YOU WANT TO ENABLE THE CONTROL PROTOCOL-->
-       <DEFINE name="control.enabled" value="NO" />
-
-       <!--MAXIMUM NUMBER OF EXTERNAL SERVERS THAT CAN BE EXECUTED-->
-       <DEFINE name="server.max_servers" value="100" />
-
-  <!--SET HERE THE NAME FOR THE CONTROL ADMIN. WE SUGGEST YOU YO USE
-      SOMETHING DIFFERENT FROM ADMIN, ADMINISTRATOR OR ROOT-->
-  <DEFINE name="control.admin" value="ADMIN" />
-
-  <!--DEFINE HERE A GOOD STRONG PASSWORD FOR THE ADMIN-->
-  <DEFINE name="control.password" value="PLEASE_CHANGE_THIS_PASSWORD" />
-
-  <!--FTP GLOBAL CONFIGURATION-->
-  <!--ALLOW ANONYMOUS LOGIN-->
-  <DEFINE name="ftp.allow_anonymous" value="NO" />
-
-  <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
-  <DEFINE name="ftp.anonymous_need_pass" value="NO" />
-
-  <!--ALLOW ASYNCHRONOUS CMDS LIKE Abor, Quit, Stat-->
-  <DEFINE name="ftp.allow_asynchronous_cmds" value="YES" />
-
-  <!--ALLOW CLIENTS TO SEND MORE THAN ONE COMMAND TO SERVER INTO ONE REQUEST-->
-  <DEFINE name="ftp.allow_pipelining" value="NO" />
-
-  <!--ALLOW CLIENTS TO CHANGE SERVER FILES-->
-  <DEFINE name="ftp.allow_store" value="NO" />
-</MYSERVER>

Deleted: trunk/myserver/binaries/myserver.xml.unix.default
===================================================================
--- trunk/myserver/binaries/myserver.xml.unix.default   2009-03-01 17:57:42 UTC 
(rev 3017)
+++ trunk/myserver/binaries/myserver.xml.unix.default   2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<!--MODIFY THE FILE ONLY IF YOU ARE SURE OF WHAT YOU ARE DOING-->
-<MYSERVER>
-
-       <!--CHOOSE THE LANGUAGE TO USE FOR THE SERVER-->
-       <DEFINE name="server.language" value="english.xml" />
-
-       <!--VERBOSITY ON LOG FILE-->
-       <DEFINE name="server.verbosity" value="2" />
-
-       <!--NUMBER OF SERVING THREADS ALWAYS ACTIVE-->
-  <DEFINE name="server.static_threads" value="5" />
-
-       <!--MAXIMUM NUMBER OF SERVING THREADS THAT THE SCHEDULER CAN
-                       CREATE-->
-       <DEFINE name="server.max_threads" value="200" />
-
-       <!--DIMENSION OF EVERY BUFFER IN BYTES IF ON THE MACHINE THERE IS A
-                       LOT OF RAM      THIS VALUES CAN BE INCREASED TO MAKE 
MYSERVER
-                       FASTER. NORMALLY THE MEMORY USED BY BUFFERS IS EQUAL TO
-                       BUFFER_SIZE * 2 * NUM_OF_THREADS-->
-       <DEFINE name="server.buffer_size" value="102400" />
-
-       <!--DEFAULT FILENAME TO SEND IN A DIRECTORY
-                       IF THE FILE ISN'T IN THE PATH THEN THE DIRECTORY
-                       CONTENT IS SENT -->
-       <DEFAULT_FILENAME>default.html</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>default.htm</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>default.php</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>index.html</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>index.htm</DEFAULT_FILENAME>
-       <DEFAULT_FILENAME>index.php</DEFAULT_FILENAME>
-
-       <!--TIMEOUT OF EVERY CLIENTS CONNECTED TO THE SERVER.
-                       IF THE CLIENT DOESN'T REQUEST ANYTHING FOR N
-                       SECONDS THE CONNECTION WITH THE CLIENT IS
-                       CLOSED. SET THIS TO 0 IF YOU DON'T WANT USE
-                       KEEP-ALIVE CONNECTIONS  -->
-       <DEFINE name="connection.timeout" value="60" />
-
-       <!--SET THIS TO YES FOR USE PERSONALIZED PAGES TO SEND MESSAGE,
-                       PERSONALIZED PAGES ARE IN THE SYSTEM DIRECTORY  -->
-       <DEFINE name="http.use_error_file" value="YES" />
-
-       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ALLOW TO THE SERVER. IF
-                       0 THEN INFINITE CONNECTIONS ARE ALLOWED.-->
-       <DEFINE name="server.max_connections" value="0" />
-
-       <!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ACCEPT.-->
-       <DEFINE name="server.max_accepted_connections" value="0" />
-
-  <!-- TEXT AND BACKGROUND ATTRIBUTES FOR CONSOLE LOG MESSAGES. -->
-  <CONSOLE_COLORS info_fg="white" info_bg="black" warning_fg="yellow" 
-                  warning_bg="black" error_fg="red" error_bg="black"/>
-
-       <!--MAX SIZE OF THE LOG FILE IN BYTES   -->
-       <DEFINE name="server.max_log_size" value="1048576" />
-
-       <!--DEFINE THE FOLDER BROWSING STYLE-->
-       <DEFINE name="http.dir.css" value="/sys/css/browsestyle.css" />
-
-       <!--DEFINE THE ADMINISTRATOR E-MAIL-->
-       <DEFINE name="server.admin" value="address@hidden" />
-
-       <!--DEFINE THE GZIP COMPRESSION THRESHOLD VALUE-->
-       <DEFINE name="gzip.threshold" value="1048576" />
-
-       <!--DEFINE IF LINKS SHOULD BE FOLLOWED-->
-       <DEFINE name="symlinks.follow" value="YES" />
-
-       <!--MAX CACHE SIZE FOR STATIC FILES-->
-       <DEFINE name="server.max_files_cache" value="10485760" />
-
-       <!--MAX CACHE SIZE FOR SINGLE STATIC FILE-->
-       <DEFINE name="server.max_file_cache" value="1048576" />
-
-       <!--MIN CACHE SIZE FOR SINGLE STATIC FILE-->
-       <DEFINE name="server.min_file_cache" value="1048576" />
-
-       <!-- ENABLE HOME DIRECTORY PER USER -->
-       <DEFINE name="http.use_home_directory" value="NO" />
-
-       <!-- DEFINE NAME FOR HOME DIRECTORY BROWSING, BY DEFAULT THE SERVER
-                        USES public_html -->
-       <DEFINE name="http.home_directory" value="public_html" />
-
-  <!--SET THIS TO YES IF YOU WANT TO ENABLE THE CONTROL PROTOCOL-->
-       <DEFINE name="control.enabled" value="NO" />
-
-       <!--MAXIMUM NUMBER OF EXTERNAL SERVERS THAT CAN BE EXECUTED-->
-       <DEFINE name="server.max_servers" value="100" />
-
-  <!--SET HERE THE NAME FOR THE CONTROL ADMIN. WE SUGGEST YOU YO USE
-      SOMETHING DIFFERENT FROM ADMIN, ADMINISTRATOR OR ROOT-->
-  <DEFINE name="control.admin" value="ADMIN" />
-
-  <!--DEFINE HERE A GOOD STRONG PASSWORD FOR THE ADMIN-->
-  <DEFINE name="control.password" value="PLEASE_CHANGE_THIS_PASSWORD" />
-
-  <!--FTP GLOBAL CONFIGURATION-->
-  <!--ALLOW ANONYMOUS LOGIN-->
-  <DEFINE name="ftp.allow_anonymous" value="NO" />
-
-  <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
-  <DEFINE name="ftp.anonymous_need_pass" value="NO" />
-
-  <!--ALLOW ASYNCHRONOUS CMDS LIKE Abor, Quit, Stat-->
-  <DEFINE name="ftp.allow_asynchronous_cmds" value="YES" />
-
-  <!--ALLOW CLIENTS TO SEND MORE THAN ONE COMMAND TO SERVER INTO ONE REQUEST-->
-  <DEFINE name="ftp.allow_pipelining" value="NO" />
-
-  <!--ALLOW CLIENTS TO CHANGE SERVER FILES-->
-  <DEFINE name="ftp.allow_store" value="NO" />
-</MYSERVER>

Added: trunk/myserver/binaries/virtualhosts.default.windows.xml
===================================================================
--- trunk/myserver/binaries/virtualhosts.default.windows.xml                    
        (rev 0)
+++ trunk/myserver/binaries/virtualhosts.default.windows.xml    2009-03-01 
18:35:31 UTC (rev 3018)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<VHOSTS>
+
+       <VHOST>
+               <NAME>Every HTTP connection</NAME>
+               
+               <PORT>80</PORT>
+               <PROTOCOL>HTTP</PROTOCOL>
+               
+               <DOCROOT>web</DOCROOT>
+               <SYSFOLDER>system</SYSFOLDER>
+
+               <ACCESSLOG>
+                  <STREAM location="file://logs/MyServerHTTP.log" 
cycle="1048576"/>
+                </ACCESSLOG>
+
+                <WARNINGLOG>
+                  <STREAM location="file://logs/MyServerHTTP.err" 
cycle="1048576"/>
+                </WARNINGLOG>
+       </VHOST>
+
+       <VHOST>
+               <NAME>FTP connection</NAME>
+               
+               <PORT>21</PORT>
+               <PROTOCOL>FTP</PROTOCOL>
+               
+               <DOCROOT>web</DOCROOT>
+               <SYSFOLDER>system</SYSFOLDER>
+               
+               <ACCESSLOG>
+                  <STREAM location="file://logs/MyServerFTP.log" 
cycle="1048576"/>
+                </ACCESSLOG>
+
+               <WARNINGLOG>
+                  <STREAM location="file://logs/MyServerFTP.err" 
cycle="1048576"/>
+                </WARNINGLOG>
+       </VHOST>
+</VHOSTS>


Property changes on: trunk/myserver/binaries/virtualhosts.default.windows.xml
___________________________________________________________________
Added: svn:executable
   + *

Copied: trunk/myserver/binaries/virtualhosts.default.xml (from rev 3017, 
trunk/myserver/binaries/virtualhosts.xml.unix.default)
===================================================================
--- trunk/myserver/binaries/virtualhosts.default.xml                            
(rev 0)
+++ trunk/myserver/binaries/virtualhosts.default.xml    2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<VHOSTS>
+
+       <VHOST>
+               <NAME>Every connection</NAME>
+               
+               <PORT>80</PORT>
+               <PROTOCOL>HTTP</PROTOCOL>
+
+               <DOCROOT>/var/web/</DOCROOT>
+               <SYSFOLDER>/usr/local/share/myserver/system/</SYSFOLDER>
+
+               <ACCESSLOG>
+                  <STREAM location="file:///var/log/myserver/MyServerHTTP.log" 
cycle="1048576"/>
+                </ACCESSLOG>
+
+                <WARNINGLOG>
+                  <STREAM location="file:///var/log/myserver/MyServerHTTP.err" 
cycle="1048576"/>
+                </WARNINGLOG>
+       </VHOST>
+
+       <VHOST>
+               <NAME>FTP connection</NAME>
+               
+               <PORT>21</PORT>
+               <PROTOCOL>FTP</PROTOCOL>
+
+               <DOCROOT>/var/web/</DOCROOT>
+               <SYSFOLDER>/usr/local/share/myserver/system/</SYSFOLDER>
+
+               <ACCESSLOG>
+                  <STREAM location="file:///var/log/myserver/MyServerFTP.log" 
cycle="1048576"/>
+                </ACCESSLOG>
+
+               <WARNINGLOG>
+                  <STREAM location="file:///var/log/myserver/MyServerFTP.err" 
cycle="1048576"/>
+                </WARNINGLOG>
+       </VHOST>
+</VHOSTS>


Property changes on: trunk/myserver/binaries/virtualhosts.default.xml
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Deleted: trunk/myserver/binaries/virtualhosts.xml.default
===================================================================
--- trunk/myserver/binaries/virtualhosts.xml.default    2009-03-01 17:57:42 UTC 
(rev 3017)
+++ trunk/myserver/binaries/virtualhosts.xml.default    2009-03-01 18:35:31 UTC 
(rev 3018)
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<VHOSTS>
-
-       <VHOST>
-               <NAME>Every HTTP connection</NAME>
-               
-               <PORT>80</PORT>
-               <PROTOCOL>HTTP</PROTOCOL>
-               
-               <DOCROOT>web</DOCROOT>
-               <SYSFOLDER>system</SYSFOLDER>
-
-               <ACCESSLOG>
-                  <STREAM location="file://logs/MyServerHTTP.log" 
cycle="1048576"/>
-                </ACCESSLOG>
-
-                <WARNINGLOG>
-                  <STREAM location="file://logs/MyServerHTTP.err" 
cycle="1048576"/>
-                </WARNINGLOG>
-       </VHOST>
-
-       <VHOST>
-               <NAME>FTP connection</NAME>
-               
-               <PORT>21</PORT>
-               <PROTOCOL>FTP</PROTOCOL>
-               
-               <DOCROOT>web</DOCROOT>
-               <SYSFOLDER>system</SYSFOLDER>
-               
-               <ACCESSLOG>
-                  <STREAM location="file://logs/MyServerFTP.log" 
cycle="1048576"/>
-                </ACCESSLOG>
-
-               <WARNINGLOG>
-                  <STREAM location="file://logs/MyServerFTP.err" 
cycle="1048576"/>
-                </WARNINGLOG>
-       </VHOST>
-</VHOSTS>

Deleted: trunk/myserver/binaries/virtualhosts.xml.unix.default
===================================================================
--- trunk/myserver/binaries/virtualhosts.xml.unix.default       2009-03-01 
17:57:42 UTC (rev 3017)
+++ trunk/myserver/binaries/virtualhosts.xml.unix.default       2009-03-01 
18:35:31 UTC (rev 3018)
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<VHOSTS>
-
-       <VHOST>
-               <NAME>Every connection</NAME>
-               
-               <PORT>80</PORT>
-               <PROTOCOL>HTTP</PROTOCOL>
-
-               <DOCROOT>/var/web/</DOCROOT>
-               <SYSFOLDER>/usr/local/share/myserver/system/</SYSFOLDER>
-
-               <ACCESSLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerHTTP.log" 
cycle="1048576"/>
-                </ACCESSLOG>
-
-                <WARNINGLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerHTTP.err" 
cycle="1048576"/>
-                </WARNINGLOG>
-       </VHOST>
-
-       <VHOST>
-               <NAME>FTP connection</NAME>
-               
-               <PORT>21</PORT>
-               <PROTOCOL>FTP</PROTOCOL>
-
-               <DOCROOT>/var/web/</DOCROOT>
-               <SYSFOLDER>/usr/local/share/myserver/system/</SYSFOLDER>
-
-               <ACCESSLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerFTP.log" 
cycle="1048576"/>
-                </ACCESSLOG>
-
-               <WARNINGLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerFTP.err" 
cycle="1048576"/>
-                </WARNINGLOG>
-       </VHOST>
-</VHOSTS>

Modified: trunk/myserver/src/myserver.cpp
===================================================================
--- trunk/myserver/src/myserver.cpp     2009-03-01 17:57:42 UTC (rev 3017)
+++ trunk/myserver/src/myserver.cpp     2009-03-01 18:35:31 UTC (rev 3018)
@@ -1,18 +1,18 @@
 /*
-MyServer
-Copyright (C) 2002-2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
+  MyServer
+  Copyright (C) 2002-2009 Free Software Foundation, Inc.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 3 of the License, or
+  (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
@@ -47,7 +47,7 @@
 void __stdcall myServerMain (u_long , LPTSTR *argv);
 static BOOL SignalHandler(DWORD type) ;
 #else
-int  writePidfile(const char*);
+int  writePidfile(const char* file = NULL);
 #endif
 void runService();
 void registerService();
@@ -134,56 +134,56 @@
 
 /* Use the GNU C argp parser under not windows environments.  */
 static struct argp_option options[] =
-{
-  /* LONG NAME - SHORT NAME - PARAMETER NAME - FLAGS - DESCRIPTION.  */
-  {"version", 'v', "VERSION", OPTION_ARG_OPTIONAL , "Print the version for the 
application"},
-  {"run", 'r', "RUN", OPTION_ARG_OPTIONAL, "Specify how run the server (by 
default console mode)"},
-  {"log", 'l', "location", 0, "Specify the location (in the format 
protocol://resource) to use to log main myserver messages"},
-  {"pidfile", 'p', "pidfile", 0, "Specify the file where write the PID"},
-  {"fork_server", 'f', "", OPTION_ARG_OPTIONAL, "Specify if use a fork 
server"},
-  {0}
-};
+  {
+    /* LONG NAME - SHORT NAME - PARAMETER NAME - FLAGS - DESCRIPTION.  */
+    {"version", 'v', "VERSION", OPTION_ARG_OPTIONAL , "Print the version for 
the application"},
+    {"run", 'r', "RUN", OPTION_ARG_OPTIONAL, "Specify how run the server (by 
default console mode)"},
+    {"log", 'l', "location", 0, "Specify the location (in the format 
protocol://resource) to use to log main myserver messages"},
+    {"pidfile", 'p', "pidfile", 0, "Specify the file where write the PID"},
+    {"fork_server", 'f', "", OPTION_ARG_OPTIONAL, "Specify if use a fork 
server"},
+    {0}
+  };
 
 static error_t parseOpt(int key, char *arg, struct argp_state *state)
 {
   argp_input *in = static_cast<argp_input*>(state->input);
   switch(key)
-  {
-  case 'v':
-    in->version = 1;
-    break;
+    {
+    case 'v':
+      in->version = 1;
+      break;
 
-  case 'r':
-    if(arg)
-    {
-      if(!strcmpi(arg, "CONSOLE"))
+    case 'r':
+      if(arg)
+        {
+          if(!strcmpi(arg, "CONSOLE"))
+            in->runas = MYSERVER_RUNAS_CONSOLE;
+          else if(!strcmpi(arg, "SERVICE"))
+            in->runas = MYSERVER_RUNAS_SERVICE;
+        }
+      else
         in->runas = MYSERVER_RUNAS_CONSOLE;
-      else if(!strcmpi(arg, "SERVICE"))
-        in->runas = MYSERVER_RUNAS_SERVICE;
-    }
-    else
-      in->runas = MYSERVER_RUNAS_CONSOLE;
-    break;
+      break;
 
-  case 'l':
-    in->logFileName = arg;
-    break;
+    case 'l':
+      in->logFileName = arg;
+      break;
 
-  case 'f':
-    in->useForkServer = 1;
-    break;
+    case 'f':
+      in->useForkServer = 1;
+      break;
 
-  case 'p':
-    in->pidFileName = arg;
-    break;
+    case 'p':
+      in->pidFileName = arg;
+      break;
 
-  case ARGP_KEY_ARG:
-  case ARGP_KEY_END:
-    break;
+    case ARGP_KEY_ARG:
+    case ARGP_KEY_END:
+      break;
 
-  default:
-    return static_cast<error_t>(ARGP_ERR_UNKNOWN);
-  }
+    default:
+      return static_cast<error_t>(ARGP_ERR_UNKNOWN);
+    }
   return static_cast<error_t>(0);
 }
 
@@ -199,31 +199,33 @@
 int loadExternalPath(string &externalPath)
 {
   try
-  {
-    externalPath = "";
+    {
+      externalPath = "";
 
-#ifdef NOT_WIN
-    if(FilesUtility::fileExists("plugins"))
-    externalPath.assign("plugins");
-    else
-    {
+#ifdef WIN32
+      externalPath.assign("plugins");
+#else
+      if(FilesUtility::fileExists("plugins"))
+        externalPath.assign("plugins");
+      else
+        {
 #ifdef PREFIX
-      externalPath.assign(PREFIX);
-      externalPath.append("/lib/myserver/plugins");
+          externalPath.assign(PREFIX);
+          externalPath.append("/lib/myserver/plugins");
 #else
-      externalPath.assign("/usr/lib/myserver/plugins");
+          externalPath.assign("/usr/lib/myserver/plugins");
 #endif
-    }
+        }
 
 #endif
 
 #ifdef WIN32
-    externalPath.assign("plugins");
+      externalPath.assign("plugins");
 #endif
-  }
+    }
   catch (...)
-  {
-  }
+    {
+    }
   return 0;
 }
 
@@ -235,38 +237,41 @@
 int loadLanguagesPath(string &languagesPath)
 {
   try
-  {
-    languagesPath = "";
+    {
+      languagesPath = "";
 
-#ifndef WIN32
-    /*
-     *Do not use the files in the directory /usr/share/myserver/languages
-     *if exists a local directory.
-     */
-    if (FilesUtility::fileExists("languages"))
-    {
+#ifdef WIN32
       languagesPath.assign(getdefaultwd(0, 0));
       languagesPath.append("/languages/");
-    }
-    else
-    {
+#else
+      /*
+       *Do not use the files in the directory /usr/share/myserver/languages
+       *if exists a local directory.
+       */
+      if (FilesUtility::fileExists("languages"))
+        {
+          languagesPath.assign(getdefaultwd(0, 0));
+          languagesPath.append("/languages/");
+        }
+      else
+        {
 #ifdef PREFIX
-      languagesPath.assign(PREFIX);
-      languagesPath.append("/share/myserver/languages/");
+          languagesPath.assign(PREFIX);
+          languagesPath.append("/share/myserver/languages/");
 #else
-      /* Default PREFIX is /usr/.  */
-      languagesPath.assign("/usr/share/myserver/languages/");
+          /* Default PREFIX is /usr/.  */
+          languagesPath.assign("/usr/share/myserver/languages/");
 #endif
-    }
+        }
 #endif
 
 #ifdef WIN32
-    languagesPath.assign( "languages/" );
+      languagesPath.assign( "languages/" );
 #endif
-  }
+    }
   catch (...)
-  {
-  }
+    {
+    }
   return 0;
 }
 
@@ -277,34 +282,36 @@
 int loadVHostConfFilesLocation(string &vhostConfigurationFile)
 {
   try
-  {
-    vhostConfigurationFile = "";
+    {
+      vhostConfigurationFile = "";
 
-#ifndef WIN32
-    /*
-     *Under an *nix environment look for .xml files in the following order.
-     *1) myserver executable working directory
-     *2) ~/.myserver/
-     *3) /etc/myserver/
-     *4) default files will be copied in myserver executable working
-     */
-    if (FilesUtility::fileExists("virtualhosts.xml"))
-    {
+#ifdef WIN32
       vhostConfigurationFile.assign("virtualhosts.xml");
+#else
+      /*
+       *Under an *nix environment look for .xml files in the following order.
+       *1) myserver executable working directory
+       *2) ~/.myserver/
+       *3) /etc/myserver/
+       *4) default files will be copied in myserver executable working
+       */
+      if (FilesUtility::fileExists("virtualhosts.xml"))
+        {
+          vhostConfigurationFile.assign("virtualhosts.xml");
+        }
+      else if (FilesUtility::fileExists("~/.myserver/virtualhosts.xml"))
+        {
+          vhostConfigurationFile.assign("~/.myserver/virtualhosts.xml");
+        }
+      else if (FilesUtility::fileExists("/etc/myserver/virtualhosts.xml"))
+        {
+          vhostConfigurationFile.assign("/etc/myserver/virtualhosts.xml");
+        }
+#endif
     }
-    else if (FilesUtility::fileExists("~/.myserver/virtualhosts.xml"))
+  catch (...)
     {
-      vhostConfigurationFile.assign("~/.myserver/virtualhosts.xml");
     }
-    else if (FilesUtility::fileExists("/etc/myserver/virtualhosts.xml"))
-    {
-      vhostConfigurationFile.assign("/etc/myserver/virtualhosts.xml");
-    }
-#endif
-  }
-  catch (...)
-  {
-  }
   return 0;
 }
 
@@ -316,34 +323,36 @@
 int loadMimeConfFilesLocation(string &mimeConfigurationFile)
 {
   try
-  {
-    mimeConfigurationFile = "";
+    {
+      mimeConfigurationFile = "";
 
-#ifndef WIN32
-    /*
-     *Under an *nix environment look for .xml files in the following order.
-     *1) myserver executable working directory
-     *2) ~/.myserver/
-     *3) /etc/myserver/
-     *4) default files will be copied in myserver executable working
-     */
-    if (FilesUtility::fileExists("MIMEtypes.xml"))
-    {
+#ifdef WIN32
       mimeConfigurationFile.assign("MIMEtypes.xml");
+#else
+      /*
+       *Under an *nix environment look for .xml files in the following order.
+       *1) myserver executable working directory
+       *2) ~/.myserver/
+       *3) /etc/myserver/
+       *4) default files will be copied in myserver executable working
+       */
+      if (FilesUtility::fileExists("MIMEtypes.xml"))
+        {
+          mimeConfigurationFile.assign("MIMEtypes.xml");
+        }
+      else if (FilesUtility::fileExists("~/.myserver/MIMEtypes.xml"))
+        {
+          mimeConfigurationFile.assign("~/.myserver/MIMEtypes.xml");
+        }
+      else if (FilesUtility::fileExists("/etc/myserver/MIMEtypes.xml"))
+        {
+          mimeConfigurationFile.assign("/etc/myserver/MIMEtypes.xml");
+        }
+#endif
     }
-    else if (FilesUtility::fileExists("~/.myserver/MIMEtypes.xml"))
+  catch (...)
     {
-      mimeConfigurationFile.assign("~/.myserver/MIMEtypes.xml");
     }
-    else if (FilesUtility::fileExists("/etc/myserver/MIMEtypes.xml"))
-    {
-      mimeConfigurationFile.assign("/etc/myserver/MIMEtypes.xml");
-    }
-#endif
-  }
-  catch (...)
-  {
-  }
   return 0;
 }
 
@@ -355,35 +364,36 @@
 int loadMainConfFilesLocation(string &mainConfigurationFile)
 {
   try
-  {
-    mainConfigurationFile = "";
+    {
+      mainConfigurationFile = "";
 
-#ifndef WIN32
-
-    /*
-     *Under an *nix environment look for .xml files in the following order.
-     *1) myserver executable working directory
-     *2) ~/.myserver/
-     *3) /etc/myserver/
-     *4) default files will be copied in myserver executable working
-     */
-    if (FilesUtility::fileExists("myserver.xml"))
-    {
+#ifdef WIN32
       mainConfigurationFile.assign("myserver.xml");
+#else
+      /*
+       *Under an *nix environment look for .xml files in the following order.
+       *1) myserver executable working directory
+       *2) ~/.myserver/
+       *3) /etc/myserver/
+       *4) default files will be copied in myserver executable working
+       */
+      if (FilesUtility::fileExists("myserver.xml"))
+        {
+          mainConfigurationFile.assign("myserver.xml");
+        }
+      else if (FilesUtility::fileExists("~/.myserver/myserver.xml"))
+        {
+          mainConfigurationFile.assign("~/.myserver/myserver.xml");
+        }
+      else if (FilesUtility::fileExists("/etc/myserver/myserver.xml"))
+        {
+          mainConfigurationFile.assign("/etc/myserver/myserver.xml");
+        }
+#endif
     }
-    else if (FilesUtility::fileExists("~/.myserver/myserver.xml"))
+  catch (...)
     {
-      mainConfigurationFile.assign("~/.myserver/myserver.xml");
     }
-    else if (FilesUtility::fileExists("/etc/myserver/myserver.xml"))
-    {
-      mainConfigurationFile.assign("/etc/myserver/myserver.xml");
-    }
-#endif
-  }
-  catch (...)
-  {
-  }
   return 0;
 }
 
@@ -393,7 +403,7 @@
  *Return nonzero on errors.
  */
 int loadConfFilesLocation(string &mainConfigurationFile, string 
&mimeConfigurationFile,
-    string &vhostConfigurationFile, string &externalPath, string 
&languagesPath)
+                          string &vhostConfigurationFile, string 
&externalPath, string &languagesPath)
 {
   if (loadMainConfFilesLocation(mainConfigurationFile))
     return -1;
@@ -435,14 +445,14 @@
   registerSignals();
 
   try
-  {
-    Server::createInstance();
-  }
+    {
+      Server::createInstance();
+    }
   catch(...)
-  {
-    /* Die if we get exceptions here.  */
-    return(1);
-  };
+    {
+      /* Die if we get exceptions here.  */
+      return(1);
+    };
 
   {
     u_int pathLen = 0;
@@ -457,24 +467,24 @@
     strncpy(path, argv[0], pathLen);
 
     for(len = 0; len < pathLen; len++)
-    {
-      if(path[len] == '/' || path[len] == '\\')
       {
-        differentCwd = true;
-        break;
+        if(path[len] == '/' || path[len] == '\\')
+          {
+            differentCwd = true;
+            break;
+          }
       }
-    }
 
     /* Current working directory is where the myserver executable is.  */
     if(differentCwd)
-    {
-      len = pathLen;
-      while((path[len] != '\\') && (path[len] != '/'))
-        len--;
-      path[len] = '\0';
+      {
+        len = pathLen;
+        while((path[len] != '\\') && (path[len] != '/'))
+          len--;
+        path[len] = '\0';
 
-      setcwd(path);
-    }
+        setcwd(path);
+      }
 
     /* We can free path memory now.  */
     delete [] path;
@@ -493,66 +503,66 @@
   argp_parse(&myserverArgp, argn, argv, 0, 0, &input);
   runas=input.runas;
   if(input.logFileName)
-  {
-    if (Server::getInstance ()->setLogLocation (input.logFileName))
     {
-      cout << "Error setting the location for the MyServer's main log" << endl;
-      return 1;
+      if (Server::getInstance ()->setLogLocation (input.logFileName))
+        {
+          cout << "Error setting the location for the MyServer's main log" << 
endl;
+          return 1;
+        }
     }
-  }
   /* If the version flag is up, show the version and exit.  */
   if(input.version)
-  {
-    cout << MYSERVER_VERSION << endl;
+    {
+      cout << MYSERVER_VERSION << endl;
 
-    cout
+      cout
 #ifdef __DATE__
-      << "Compiled on " << __DATE__
+        << "Compiled on " << __DATE__
 #endif
-      << endl;
+        << endl;
 
-    cout << "http://www.gnu.org/software/myserver"; << endl;
-    return 0;
-  }
+      cout << "http://www.gnu.org/software/myserver"; << endl;
+      return 0;
+    }
 #else
   if(argn > 1)
-  {
-    if(!strcmpi(argv[1], "VERSION"))
     {
-      cout << MYSERVER_VERSION << endl;
-      return 0;
-    }
-    if(!strcmpi(argv[1], "CONSOLE"))
-    {
-      runas = MYSERVER_RUNAS_CONSOLE;
-    }
-    if(!strcmpi(argv[1], "REGISTER"))
-    {
-      registerService();
+      if(!strcmpi(argv[1], "VERSION"))
+        {
+          cout << MYSERVER_VERSION << endl;
+          return 0;
+        }
+      if(!strcmpi(argv[1], "CONSOLE"))
+        {
+          runas = MYSERVER_RUNAS_CONSOLE;
+        }
+      if(!strcmpi(argv[1], "REGISTER"))
+        {
+          registerService();
 #ifndef ARGP
-      RunAsService();
+          RunAsService();
 #endif
-      runas = MYSERVER_RUNAS_SERVICE;
-      return 0;
+          runas = MYSERVER_RUNAS_SERVICE;
+          return 0;
+        }
+      if(!strcmpi(argv[1], "RUNSERVICE"))
+        {
+          RunAsService();
+          return 0;
+        }
+      if(!strcmpi(argv[1], "UNREGISTER"))
+        {
+          removeService();
+          runas = MYSERVER_RUNAS_SERVICE;
+        }
+      if(!strcmpi(argv[1], "SERVICE"))
+        {
+          /*
+           *Set the log file to use when in service mode.
+           */
+          runas = MYSERVER_RUNAS_SERVICE;
+        }
     }
-    if(!strcmpi(argv[1], "RUNSERVICE"))
-    {
-      RunAsService();
-      return 0;
-    }
-    if(!strcmpi(argv[1], "UNREGISTER"))
-    {
-      removeService();
-      runas = MYSERVER_RUNAS_SERVICE;
-    }
-    if(!strcmpi(argv[1], "SERVICE"))
-    {
-      /*
-       *Set the log file to use when in service mode.
-       */
-      runas = MYSERVER_RUNAS_SERVICE;
-    }
-  }
 #endif
 
 #ifdef ARGP
@@ -564,74 +574,75 @@
    *Start here the MyServer execution.
    */
   try
-     {
-       setcwdBuffer();
-        loadConfFilesLocation(mainConf, mimeConf, vhostConf, externPath, 
langPath);
+    {
+      setcwdBuffer();
+      loadConfFilesLocation(mainConf, mimeConf, vhostConf, externPath, 
langPath);
 
-       switch(runas)
-       {
-       case MYSERVER_RUNAS_CONSOLE:
-         consoleService(mainConf, mimeConf, vhostConf, externPath, langPath);
-         break;
-       case MYSERVER_RUNAS_SERVICE:
+      switch(runas)
+        {
+        case MYSERVER_RUNAS_CONSOLE:
+          consoleService(mainConf, mimeConf, vhostConf, externPath, langPath);
+          break;
+        case MYSERVER_RUNAS_SERVICE:
 #ifdef WIN32
-         runService();
+          runService();
 #else
-         /*
-          *Run the daemon.
-          *pid is the process ID for the forked process.
-          *Fork the process.
-          */
-         pid = fork();
+          /*
+           *Run the daemon.
+           *pid is the process ID for the forked process.
+           *Fork the process.
+           */
+          pid = fork();
 
-         /*
-          *An error happened, return with errors.
-          */
-         if (pid < 0)
-         {
-          return 1;
-         }
+          /*
+           *An error happened, return with errors.
+           */
+          if (pid < 0)
+            {
+              return 1;
+            }
 
-        if (pid)
-        {
-          /*
-           *Store the PID.
-           */
+          if (pid)
+            {
+              /*
+               *Store the PID.
+               */
 #ifdef ARGP
-          if(input.pidFileName)
-            writePidfile(input.pidFileName);
-          else
-            writePidfile("/var/run/myserver.pid");
+              if(input.pidFileName)
+                writePidfile(input.pidFileName);
+              else
+                {
+                  writePidfile();
+                }
 #else
-          writePidfile("/var/run/myserver.pid");
+              writePidfile();
 #endif
-          return 0;
-        }
-
-         /*
-          *Create a SID for the new process.
-          */
-        sid = setsid();
-
-         /*
-          *Error in setting a new sid, return the error.
-          */
-        if (sid < 0)
-          return 1;
-         
-
-         /*
-          *Finally run the server from the forked process.
-          */
+              return 0;
+            }
+          /*
+           *Create a SID for the new process.
+           */
+          sid = setsid();
+   
+          /*
+           *Error in setting a new sid, return the error.
+           */
+          if (sid < 0)
+            return 1;
+   
+   
+          /*
+           *Finally run the server from the forked process.
+           */
           consoleService(mainConf, mimeConf, vhostConf, externPath, langPath);
 #endif
-      break;
-       }
-     }
-   catch(...)
-     {
-       return 1;
-     };
+          break;
+        }
+    }
+  catch(...)
+    {
+      return 1;
+    };
 
 #ifdef ARGP
   if (input.useForkServer)
@@ -646,22 +657,33 @@
 /*!
  *Write the current PID to the file.
  */
-int writePidfile(const char* filename)
+int writePidfile (const char* filename)
 {
   int pidfile;
   pid_t pid = getpid();
   char buff[12];
   int ret;
-  pidfile = open(filename, O_RDWR | O_CREAT);
+  string file = "";
 
-  if(pidfile == -1)
+  if (filename == NULL)
+    {
+#ifdef PREFIX
+      file.assign (PREFIX);
+      file.append ("/");
+#endif
+      file.append ("/var/run/myserver.pid");
+    }
+
+  pidfile = open (filename, O_RDWR | O_CREAT);
+
+  if (pidfile == -1)
     return -1;
 
-  sprintf(buff,"%i\n", pid);
-  ret = write(pidfile, buff, strlen(buff));
+  sprintf (buff,"%i\n", pid);
+  ret = write (pidfile, buff, strlen(buff));
   if(ret == -1)
     return -1;
-  return close(pidfile);
+  return close (pidfile);
 }
 #endif
 
@@ -695,39 +717,39 @@
   MyServiceStatus.dwWaitHint = 0;
 
   try
-  {
-    Server::createInstance();
-  }
+    {
+      Server::createInstance();
+    }
   catch(...)
-  {
-    /* Die if we get exceptions here.  */
-    return;
-  };
+    {
+      /* Die if we get exceptions here.  */
+      return;
+    };
 
 
   MyServiceStatusHandle = RegisterServiceCtrlHandler( "MyServer",
                                                       myServerCtrlHandler );
   if(MyServiceStatusHandle)
-  {
-    MyServiceStatus.dwCurrentState = SERVICE_START_PENDING;
-    SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
+    {
+      MyServiceStatus.dwCurrentState = SERVICE_START_PENDING;
+      SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
 
-    MyServiceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP
-                                           | SERVICE_ACCEPT_SHUTDOWN);
-    MyServiceStatus.dwCurrentState = SERVICE_RUNNING;
-    SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
+      MyServiceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP
+                                             | SERVICE_ACCEPT_SHUTDOWN);
+      MyServiceStatus.dwCurrentState = SERVICE_RUNNING;
+      SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
 
-    string null ("");
-    Server::getInstance()->start(null, null, null, null, null);
+      string null ("");
+      Server::getInstance()->start(null, null, null, null, null);
 
-    MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
-    SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
+      MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+      SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
 
-    MyServiceStatus.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP
-                                            | SERVICE_ACCEPT_SHUTDOWN);
-    MyServiceStatus.dwCurrentState = SERVICE_STOPPED;
-    SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
-  }
+      MyServiceStatus.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP
+                                              | SERVICE_ACCEPT_SHUTDOWN);
+      MyServiceStatus.dwCurrentState = SERVICE_STOPPED;
+      SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
+    }
 }
 
 /*!
@@ -736,28 +758,28 @@
 void __stdcall myServerCtrlHandler(u_long fdwControl)
 {
   switch ( fdwControl )
-  {
-  case SERVICE_CONTROL_INTERROGATE:
-    break;
+    {
+    case SERVICE_CONTROL_INTERROGATE:
+      break;
 
-  case SERVICE_CONTROL_SHUTDOWN:
-  case SERVICE_CONTROL_STOP:
-    MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
-    SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
-    Server::getInstance()->stop();
-    return;
+    case SERVICE_CONTROL_SHUTDOWN:
+    case SERVICE_CONTROL_STOP:
+      MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+      SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
+      Server::getInstance()->stop();
+      return;
 
-  case SERVICE_CONTROL_PAUSE:
-    break;
+    case SERVICE_CONTROL_PAUSE:
+      break;
 
-  case SERVICE_CONTROL_CONTINUE:
-    break;
-  default:
-    if ( fdwControl >= 128 && fdwControl <= 255 )
+    case SERVICE_CONTROL_CONTINUE:
       break;
-    else
-      break;
-  }
+    default:
+      if ( fdwControl >= 128 && fdwControl <= 255 )
+        break;
+      else
+        break;
+    }
   SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
 }
 #endif
@@ -776,20 +798,14 @@
     };
 
   if(!StartServiceCtrlDispatcher( serviceTable ))
-  {
-    if(GetLastError() == ERROR_INVALID_DATA)
     {
-      Server::getInstance()->logWriteln("Invalid data");
+      if(GetLastError() == ERROR_INVALID_DATA)
+          Server::getInstance()->logWriteln("Invalid data");
+      else if(GetLastError() == ERROR_SERVICE_ALREADY_RUNNING)
+          Server::getInstance()->logWriteln("Already running");
+      else
+          Server::getInstance()->logWriteln("Error running service");
     }
-    else if(GetLastError() == ERROR_SERVICE_ALREADY_RUNNING)
-    {
-      Server::getInstance()->logWriteln("Already running");
-    }
-    else
-    {
-      Server::getInstance()->logWriteln("Error running service");
-    }
-  }
 #endif
 }
 
@@ -807,43 +823,43 @@
 
   manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
   if (manager)
-  {
-    service = CreateService(manager,"GNU MyServer","GNU MyServer",
-                            SERVICE_ALL_ACCESS,SERVICE_WIN32_OWN_PROCESS,
-                            SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, path,
-                            0, 0, 0, 0, 0);
-    if (service)
     {
-      CloseServiceHandle (service);
+      service = CreateService(manager,"GNU MyServer","GNU MyServer",
+                              SERVICE_ALL_ACCESS,SERVICE_WIN32_OWN_PROCESS,
+                              SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, path,
+                              0, 0, 0, 0, 0);
+      if (service)
+        {
+          CloseServiceHandle (service);
+        }
+
+      CloseServiceHandle (manager);
     }
-
-    CloseServiceHandle (manager);
-  }
 #endif
 }
 
 /*
-*Unregister the OS service.
-*/
+ *Unregister the OS service.
+ */
 void removeService()
 {
 #ifdef WIN32
   SC_HANDLE service,manager;
   manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
   if (manager)
-  {
-    service = OpenService (manager, "GNU MyServer", SERVICE_ALL_ACCESS);
-    if (service)
     {
-      ControlService (service, SERVICE_CONTROL_STOP,&MyServiceStatus);
-      while (QueryServiceStatus (service, &MyServiceStatus))
-        if (MyServiceStatus.dwCurrentState != SERVICE_STOP_PENDING)
-          break;
-      DeleteService(service);
-      CloseServiceHandle (service);
-      CloseServiceHandle (manager);
+      service = OpenService (manager, "GNU MyServer", SERVICE_ALL_ACCESS);
+      if (service)
+        {
+          ControlService (service, SERVICE_CONTROL_STOP,&MyServiceStatus);
+          while (QueryServiceStatus (service, &MyServiceStatus))
+            if (MyServiceStatus.dwCurrentState != SERVICE_STOP_PENDING)
+              break;
+          DeleteService(service);
+          CloseServiceHandle (service);
+          CloseServiceHandle (manager);
+        }
     }
-  }
 #endif
 }
 
@@ -853,25 +869,25 @@
 void RunAsService()
 {
 #ifdef WIN32
-   SC_HANDLE service,manager;
+  SC_HANDLE service,manager;
 
-   manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
-   if (manager)
-   {
-     service = OpenService (manager, "MyServer", SERVICE_ALL_ACCESS);
-     if (service)
-     {
-       StartService(service,0,NULL);
+  manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
+  if (manager)
+    {
+      service = OpenService (manager, "MyServer", SERVICE_ALL_ACCESS);
+      if (service)
+        {
+          StartService(service,0,NULL);
 
-       while (QueryServiceStatus (service, &MyServiceStatus))
-       {
-         if (MyServiceStatus.dwCurrentState != SERVICE_START_PENDING)
-           break;
-       }
+          while (QueryServiceStatus (service, &MyServiceStatus))
+            {
+              if (MyServiceStatus.dwCurrentState != SERVICE_START_PENDING)
+                break;
+            }
 
-       CloseServiceHandle (service);
-       CloseServiceHandle (manager);
-     }
-   }
+          CloseServiceHandle (service);
+          CloseServiceHandle (manager);
+        }
+    }
 #endif
 }

Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp        2009-03-01 17:57:42 UTC (rev 
3017)
+++ trunk/myserver/src/server/server.cpp        2009-03-01 18:35:31 UTC (rev 
3018)
@@ -967,15 +967,15 @@
  *The configuration file is a XML file.
  *Return nonzero on errors.
  */
-int Server::initialize()
+int Server::initialize ()
 {
   const char *data;
 #ifdef WIN32
-  envString = GetEnvironmentStrings();
+  envString = GetEnvironmentStrings ();
 #endif
-  connectionsMutex = new Mutex();
+  connectionsMutex = new Mutex ();
 
-  threadsMutex = new Mutex();
+  threadsMutex = new Mutex ();
 
   /* Store the default values.  */
   nStaticThreads = 20;
@@ -990,10 +990,10 @@
   maxConnections = 0;
   maxConnectionsToAccept = 0;
 
-  if(configurationFileManager.open(mainConfigurationFile->c_str()))
+  if (configurationFileManager.open (mainConfigurationFile->c_str ()))
     return -1;
 
-  readHashedData 
(xmlDocGetRootElement(configurationFileManager.getDoc())->xmlChildrenNode);
+  readHashedData (xmlDocGetRootElement(configurationFileManager.getDoc 
())->xmlChildrenNode);
 
   /*
    * Process console colors information.
@@ -1047,57 +1047,53 @@
     verbosity = (u_long)atoi(data);
   }
 
-
-  data = configurationFileManager.getValue("server.buffer_size");
+  data = getHashedData ("server.buffer_size");
   if(data)
   {
     buffersize=secondaryBufferSize= (atol(data) > 81920) ?  atol(data) :  
81920 ;
   }
-  data = configurationFileManager.getValue("server.connection_timeout");
+
+  data = getHashedData ("server.connection_timeout");
   if(data)
   {
     connectionTimeout = MYSERVER_SEC((u_long)atol(data));
   }
 
-  data = configurationFileManager.getValue("server.static_threads");
+  data = getHashedData ("server.static_threads");
   if(data)
   {
     nStaticThreads = atoi(data);
   }
-  data = configurationFileManager.getValue("server.max_threads");
+
+  data = getHashedData ("server.max_threads");
   if(data)
   {
     nMaxThreads = atoi(data);
   }
 
   /* Get the max connections number to allow.  */
-  data = configurationFileManager.getValue("server.max_connections");
+  data = getHashedData ("server.max_connections");
   if(data)
   {
     maxConnections = atoi(data);
   }
 
   /* Get the max connections number to accept.  */
-  data = configurationFileManager.getValue("server.max_accepted_connections");
+  data = getHashedData ("server.max_accepted_connections");
   if(data)
   {
     maxConnectionsToAccept = atoi(data);
   }
 
   /* Get the default throttling rate to use on connections.  */
-  data = configurationFileManager.getValue("connection.throttling");
+  data = getHashedData ("connection.throttling");
   if(data)
   {
     throttlingRate = (u_long)atoi(data);
   }
 
-  data = configurationFileManager.getValue("connection.timeout");
-  if(data)
-  {
-    connectionTimeout=MYSERVER_SEC((u_long)atol(data));
-  }
 
-  data = configurationFileManager.getValue("server.max_log_size");
+  data = getHashedData ("server.max_log_size");
   if(data)
   {
     maxLogFileSize=(u_long)atol(data);
@@ -1112,7 +1108,7 @@
   else
     cachedFiles.initialize(1 << 23);
 
-  data = configurationFileManager.getValue("server.temp_directory");
+  data = getHashedData ("server.temp_directory");
   if (data)
   {
     string tmpPath (data);
@@ -1122,32 +1118,33 @@
   else
     FilesUtility::resetTmpPath ();
 
-  data = configurationFileManager.getValue("server.max_file_cache");
+  data = getHashedData ("server.max_file_cache");
   if(data)
   {
     u_long maxSize = (u_long)atol(data);
     cachedFiles.setMaxSize(maxSize);
   }
 
-  data = configurationFileManager.getValue("server.min_file_cache");
+  data = getHashedData ("server.min_file_cache");
   if(data)
   {
     u_long minSize = (u_long)atol(data);
     cachedFiles.setMinSize(minSize);
   }
 
-  data = configurationFileManager.getValue("server.uid");
+  data = getHashedData ("server.uid");
   if(data)
   {
     uid = atoi(data);
   }
-  data = configurationFileManager.getValue("server.gid");
+
+  data = getHashedData ("server.gid");
   if(data)
   {
     gid = atoi(data);
   }
 
-  data = configurationFileManager.getValue("server.max_servers");
+  data = getHashedData ("server.max_servers");
   if(data)
   {
     int maxServersProcesses = atoi(data);





reply via email to

[Prev in Thread] Current Thread [Next in Thread]