From MAILER-DAEMON Sun Mar 01 12:57:50 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LdpvC-0005xy-4a
	for mharc-myserver-commit@gnu.org; Sun, 01 Mar 2009 12:57:50 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ldpv9-0005uW-9a
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 12:57:47 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ldpv7-0005rf-OY
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 12:57:46 -0500
Received: from [199.232.76.173] (port=56082 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ldpv7-0005rQ-BV
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 12:57:45 -0500
Received: from savannah.gnu.org ([199.232.41.3]:46534 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1Ldpv6-0006w6-GN
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 12:57:45 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Ldpv5-0002Tz-Qm
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 17:57:43 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1Ldpv5-0002TJ-Be
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 17:57:43 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1Ldpv5-0002TJ-Be@cvs.savannah.gnu.org>
Date: Sun, 01 Mar 2009 17:57:43 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3017] Changed the format for definitions inside
	the `myserver.xml' file.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2009 17:57:47 -0000

Revision: 3017
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3017
Author:   gscrivano
Date:     2009-03-01 17:57:42 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Changed the format for definitions inside the `myserver.xml' file.

Modified Paths:
--------------
    trunk/myserver/binaries/myserver.xml.default
    trunk/myserver/binaries/myserver.xml.unix.default
    trunk/myserver/documentation/basic_configuration.texi
    trunk/myserver/documentation/directory_listing.texi
    trunk/myserver/documentation/error_pages.texi
    trunk/myserver/documentation/mime_types.texi
    trunk/myserver/documentation/process_security.texi
    trunk/myserver/include/protocol/http/http.h
    trunk/myserver/include/server/server.h
    trunk/myserver/src/conf/vhost/vhost.cpp
    trunk/myserver/src/http_handler/http_dir/http_dir.cpp
    trunk/myserver/src/http_handler/http_file/http_file.cpp
    trunk/myserver/src/protocol/control/control_protocol.cpp
    trunk/myserver/src/protocol/ftp/ftp.cpp
    trunk/myserver/src/protocol/http/env/env.cpp
    trunk/myserver/src/protocol/http/http.cpp
    trunk/myserver/src/server/server.cpp

Modified: trunk/myserver/binaries/myserver.xml.default
===================================================================
--- trunk/myserver/binaries/myserver.xml.default	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/binaries/myserver.xml.default	2009-03-01 17:57:42 UTC (rev 3017)
@@ -4,23 +4,23 @@
 <MYSERVER>
 
 	<!--CHOOSE THE LANGUAGE TO USE FOR THE SERVER-->
-	<LANGUAGE>english.xml</LANGUAGE>
+	<DEFINE name="server.language" value="english.xml" />
 
 	<!--VERBOSITY ON LOG FILE-->
-	<VERBOSITY>2</VERBOSITY>
+	<DEFINE name="server.verbosity" value="2" />
 
 	<!--NUMBER OF SERVING THREADS ALWAYS ACTIVE-->
-	<NTHREADS_STATIC>5</NTHREADS_STATIC>
+  <DEFINE name="server.static_threads" value="5" />
 
 	<!--MAXIMUM NUMBER OF SERVING THREADS THAT THE SCHEDULER CAN
 			CREATE-->
-	<NTHREADS_MAX>200</NTHREADS_MAX>
+	<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-->
-	<BUFFER_SIZE>102400</BUFFER_SIZE>
+	<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
@@ -37,112 +37,80 @@
 			SECONDS THE CONNECTION WITH THE CLIENT IS
 			CLOSED. SET THIS TO 0 IF YOU DON'T WANT USE
 			KEEP-ALIVE CONNECTIONS	-->
-	<CONNECTION_TIMEOUT>60</CONNECTION_TIMEOUT>
+	<DEFINE name="connection.timeout" value="60" />
 
 	<!--SET THIS TO YES FOR USE PERSONALIZED PAGES TO SEND MESSAGE,
 			PERSONALIZED PAGES ARE IN THE SYSTEM DIRECTORY	-->
-	<USE_ERROR_FILE>YES</USE_ERROR_FILE>
+	<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.-->
-	<MAX_CONNECTIONS>0</MAX_CONNECTIONS>
+	<DEFINE name="server.max_connections" value="0" />
 
 	<!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ACCEPT.-->
-	<MAX_CONNECTIONS_TO_ACCEPT>0</MAX_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"/>
-        
+  <!-- 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	-->
-	<MAX_LOG_FILE_SIZE>1048576</MAX_LOG_FILE_SIZE>
+	<DEFINE name="server.max_log_size" value="1048576" />
 
 	<!--DEFINE THE FOLDER BROWSING STYLE-->
-	<BROWSEFOLDER_CSS>/sys/css/browsestyle.css</BROWSEFOLDER_CSS>
+	<DEFINE name="http.dir.css" value="/sys/css/browsestyle.css" />
 
 	<!--DEFINE THE ADMINISTRATOR E-MAIL-->
-	<SERVER_ADMIN>administrator@localhost</SERVER_ADMIN>
+	<DEFINE name="server.admin" value="administrator@localhost" />
 
 	<!--DEFINE THE GZIP COMPRESSION THRESHOLD VALUE-->
-	<GZIP_THRESHOLD>1048576</GZIP_THRESHOLD>
+	<DEFINE name="gzip.threshold" value="1048576" />
 
 	<!--DEFINE IF LINKS SHOULD BE FOLLOWED-->
-	<FOLLOW_LINKS>YES</FOLLOW_LINKS>
+	<DEFINE name="symlinks.follow" value="YES" />
 
 	<!--MAX CACHE SIZE FOR STATIC FILES-->
-	<MAX_FILESCACHE_SIZE>10485760</MAX_FILESCACHE_SIZE>
+	<DEFINE name="server.max_files_cache" value="10485760" />
 
 	<!--MAX CACHE SIZE FOR SINGLE STATIC FILE-->
-	<MAX_FILESCACHE_FILESIZE>1048576</MAX_FILESCACHE_FILESIZE>
+	<DEFINE name="server.max_file_cache" value="1048576" />
 
 	<!--MIN CACHE SIZE FOR SINGLE STATIC FILE-->
-	<MIN_FILESCACHE_FILESIZE>0</MIN_FILESCACHE_FILESIZE>
+	<DEFINE name="server.min_file_cache" value="1048576" />
 
 	<!-- ENABLE HOME DIRECTORY PER USER -->
-	<USE_HOME_DIRECTORY>NO</USE_HOME_DIRECTORY>
+	<DEFINE name="http.use_home_directory" value="NO" />
 
 	<!-- DEFINE NAME FOR HOME DIRECTORY BROWSING, BY DEFAULT THE SERVER
 			 USES public_html -->
-	<HOME_DIRECTORY>public_html</HOME_DIRECTORY>
+	<DEFINE name="http.home_directory" value="public_html" />
 
   <!--SET THIS TO YES IF YOU WANT TO ENABLE THE CONTROL PROTOCOL-->
-  <CONTROL_ENABLED>NO</CONTROL_ENABLED>
+	<DEFINE name="control.enabled" value="NO" />
 
-  <!--CHOOSE IF THE CGI PROTOCOL IS ENABLED BY DEFAULT ON THE VIRTUAL
-			HOSTS-->
-	<ALLOW_CGI>YES</ALLOW_CGI>
-
-  <!--CHOOSE IF THE FASTCGI PROTOCOL IS ENABLED BY DEFAULT ON THE
-			VIRTUAL HOSTS-->
-	<ALLOW_FASTCGI>YES</ALLOW_FASTCGI>
-
-  <!--CHOOSE IF THE ISAPI PROTOCOL IS ENABLED BY DEFAULT ON THE VIRTUAL
-			HOSTS-->
-	<ALLOW_ISAPI>YES</ALLOW_ISAPI>
-
-  <!--CHOOSE IF THE WINCGI PROTOCOL IS ENABLED BY DEFAULT ON THE
-			VIRTUAL HOSTS-->
-	<ALLOW_WINCGI>YES</ALLOW_WINCGI>
-
-  <!--CHOOSE IF THE MSCGI PROTOCOL IS ENABLED BY DEFAULT-->
-	<ALLOW_MSCGI>YES</ALLOW_MSCGI>
-
-  <!--CHOOSE IF THE SCGI PROTOCOL IS ENABLED BY DEFAULT-->
-	<ALLOW_SCGI>YES</ALLOW_SCGI>
-
-  <!--CHOOSE IF A LINKED FILE CAN BE SEND BY DEFAULT-->
-	<ALLOW_SEND_LINK>YES</ALLOW_SEND_LINK>
-
-  <!--CHOOSE IF AN EXTERNAL COMMAND (A PLUGIN) CAN BE USED TO HANDLE
-			DATA-->
-	<ALLOW_EXTERNAL_COMMANDS>YES</ALLOW_EXTERNAL_COMMANDS>
-
-  <!--CHOOSE IF THE SERVER BY DEFAULT IS ENABLED TO SEND STATIC
-			FILES-->
-	<ALLOW_SEND_FILE>YES</ALLOW_SEND_FILE>
-
 	<!--MAXIMUM NUMBER OF EXTERNAL SERVERS THAT CAN BE EXECUTED-->
-	<MAX_SERVERS_PROCESSES>100</MAX_SERVERS_PROCESSES>
+	<DEFINE name="server.max_servers" value="100" />
 
-	<!--INITIAL PORT TO BIND FOR EXERNAL SERVERS-->
-	<SERVERS_PROCESSES_INITIAL_PORT>3333</SERVERS_PROCESSES_INITIAL_PORT>
-
   <!--SET HERE THE NAME FOR THE CONTROL ADMIN. WE SUGGEST YOU YO USE
       SOMETHING DIFFERENT FROM ADMIN, ADMINISTRATOR OR ROOT-->
-  <CONTROL_ADMIN>ADMIN</CONTROL_ADMIN>
+  <DEFINE name="control.admin" value="ADMIN" />
 
   <!--DEFINE HERE A GOOD STRONG PASSWORD FOR THE ADMIN-->
-  <CONTROL_PASSWORD>PLEASE_CHANGE_THIS_PASSWORD</CONTROL_PASSWORD>
+  <DEFINE name="control.password" value="PLEASE_CHANGE_THIS_PASSWORD" />
 
   <!--FTP GLOBAL CONFIGURATION-->
   <!--ALLOW ANONYMOUS LOGIN-->
-  <ALLOW_ANONYMOUS>NO</ALLOW_ANONYMOUS>
+  <DEFINE name="ftp.allow_anonymous" value="NO" />
+
   <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
-  <ANONYMOUS_NEED_PASS>YES</ANONYMOUS_NEED_PASS>
+  <DEFINE name="ftp.anonymous_need_pass" value="NO" />
+
   <!--ALLOW ASYNCHRONOUS CMDS LIKE Abor, Quit, Stat-->
-  <ALLOW_ASYNCHRONOUS_CMDS>YES</ALLOW_ASYNCHRONOUS_CMDS>
+  <DEFINE name="ftp.allow_asynchronous_cmds" value="YES" />
+
   <!--ALLOW CLIENTS TO SEND MORE THAN ONE COMMAND TO SERVER INTO ONE REQUEST-->
-  <ALLOW_PIPELINING>YES</ALLOW_PIPELINING>
+  <DEFINE name="ftp.allow_pipelining" value="NO" />
+
   <!--ALLOW CLIENTS TO CHANGE SERVER FILES-->
-  <ALLOW_STORE>NO</ALLOW_STORE>
+  <DEFINE name="ftp.allow_store" value="NO" />
 </MYSERVER>

Modified: trunk/myserver/binaries/myserver.xml.unix.default
===================================================================
--- trunk/myserver/binaries/myserver.xml.unix.default	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/binaries/myserver.xml.unix.default	2009-03-01 17:57:42 UTC (rev 3017)
@@ -4,23 +4,23 @@
 <MYSERVER>
 
 	<!--CHOOSE THE LANGUAGE TO USE FOR THE SERVER-->
-	<LANGUAGE>english.xml</LANGUAGE>
+	<DEFINE name="server.language" value="english.xml" />
 
 	<!--VERBOSITY ON LOG FILE-->
-	<VERBOSITY>2</VERBOSITY>
+	<DEFINE name="server.verbosity" value="2" />
 
 	<!--NUMBER OF SERVING THREADS ALWAYS ACTIVE-->
-	<NTHREADS_STATIC>5</NTHREADS_STATIC>
+  <DEFINE name="server.static_threads" value="5" />
 
 	<!--MAXIMUM NUMBER OF SERVING THREADS THAT THE SCHEDULER CAN
 			CREATE-->
-	<NTHREADS_MAX>200</NTHREADS_MAX>
+	<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-->
-	<BUFFER_SIZE>102400</BUFFER_SIZE>
+	<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
@@ -37,112 +37,80 @@
 			SECONDS THE CONNECTION WITH THE CLIENT IS
 			CLOSED. SET THIS TO 0 IF YOU DON'T WANT USE
 			KEEP-ALIVE CONNECTIONS	-->
-	<CONNECTION_TIMEOUT>60</CONNECTION_TIMEOUT>
+	<DEFINE name="connection.timeout" value="60" />
 
 	<!--SET THIS TO YES FOR USE PERSONALIZED PAGES TO SEND MESSAGE,
 			PERSONALIZED PAGES ARE IN THE SYSTEM DIRECTORY	-->
-	<USE_ERROR_FILE>YES</USE_ERROR_FILE>
+	<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.-->
-	<MAX_CONNECTIONS>0</MAX_CONNECTIONS>
+	<DEFINE name="server.max_connections" value="0" />
 
 	<!--DEFINE THE MAX NUMBER OF CONNECTIONS TO ACCEPT.-->
-	<MAX_CONNECTIONS_TO_ACCEPT>0</MAX_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"/>
+  <!-- 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	-->
-	<MAX_LOG_FILE_SIZE>1048576</MAX_LOG_FILE_SIZE>
+	<DEFINE name="server.max_log_size" value="1048576" />
 
 	<!--DEFINE THE FOLDER BROWSING STYLE-->
-	<BROWSEFOLDER_CSS>/sys/css/browsestyle.css</BROWSEFOLDER_CSS>
+	<DEFINE name="http.dir.css" value="/sys/css/browsestyle.css" />
 
 	<!--DEFINE THE ADMINISTRATOR E-MAIL-->
-	<SERVER_ADMIN>administrator@localhost</SERVER_ADMIN>
+	<DEFINE name="server.admin" value="administrator@localhost" />
 
 	<!--DEFINE THE GZIP COMPRESSION THRESHOLD VALUE-->
-	<GZIP_THRESHOLD>1048576</GZIP_THRESHOLD>
+	<DEFINE name="gzip.threshold" value="1048576" />
 
 	<!--DEFINE IF LINKS SHOULD BE FOLLOWED-->
-	<FOLLOW_LINKS>YES</FOLLOW_LINKS>
+	<DEFINE name="symlinks.follow" value="YES" />
 
 	<!--MAX CACHE SIZE FOR STATIC FILES-->
-	<MAX_FILESCACHE_SIZE>10485760</MAX_FILESCACHE_SIZE>
+	<DEFINE name="server.max_files_cache" value="10485760" />
 
 	<!--MAX CACHE SIZE FOR SINGLE STATIC FILE-->
-	<MAX_FILESCACHE_FILESIZE>1048576</MAX_FILESCACHE_FILESIZE>
+	<DEFINE name="server.max_file_cache" value="1048576" />
 
 	<!--MIN CACHE SIZE FOR SINGLE STATIC FILE-->
-	<MIN_FILESCACHE_FILESIZE>0</MIN_FILESCACHE_FILESIZE>
+	<DEFINE name="server.min_file_cache" value="1048576" />
 
 	<!-- ENABLE HOME DIRECTORY PER USER -->
-	<USE_HOME_DIRECTORY>NO</USE_HOME_DIRECTORY>
+	<DEFINE name="http.use_home_directory" value="NO" />
 
 	<!-- DEFINE NAME FOR HOME DIRECTORY BROWSING, BY DEFAULT THE SERVER
 			 USES public_html -->
-	<HOME_DIRECTORY>public_html</HOME_DIRECTORY>
+	<DEFINE name="http.home_directory" value="public_html" />
 
   <!--SET THIS TO YES IF YOU WANT TO ENABLE THE CONTROL PROTOCOL-->
-  <CONTROL_ENABLED>NO</CONTROL_ENABLED>
+	<DEFINE name="control.enabled" value="NO" />
 
-  <!--CHOOSE IF THE CGI PROTOCOL IS ENABLED BY DEFAULT ON THE VIRTUAL
-			HOSTS-->
-	<ALLOW_CGI>YES</ALLOW_CGI>
-
-  <!--CHOOSE IF THE FASTCGI PROTOCOL IS ENABLED BY DEFAULT ON THE
-			VIRTUAL HOSTS-->
-	<ALLOW_FASTCGI>YES</ALLOW_FASTCGI>
-
-  <!--CHOOSE IF THE ISAPI PROTOCOL IS ENABLED BY DEFAULT ON THE VIRTUAL
-			HOSTS-->
-	<ALLOW_ISAPI>YES</ALLOW_ISAPI>
-
-  <!--CHOOSE IF THE WINCGI PROTOCOL IS ENABLED BY DEFAULT ON THE
-			VIRTUAL HOSTS-->
-	<ALLOW_WINCGI>YES</ALLOW_WINCGI>
-
-  <!--CHOOSE IF THE MSCGI PROTOCOL IS ENABLED BY DEFAULT-->
-	<ALLOW_MSCGI>YES</ALLOW_MSCGI>
-
-  <!--CHOOSE IF THE SCGI PROTOCOL IS ENABLED BY DEFAULT-->
-	<ALLOW_SCGI>YES</ALLOW_SCGI>
-
-  <!--CHOOSE IF A LINKED FILE CAN BE SEND BY DEFAULT-->
-	<ALLOW_SEND_LINK>YES</ALLOW_SEND_LINK>
-
-  <!--CHOOSE IF AN EXTERNAL COMMAND (A PLUGIN) CAN BE USED TO HANDLE
-			DATA-->
-	<ALLOW_EXTERNAL_COMMANDS>YES</ALLOW_EXTERNAL_COMMANDS>
-
-  <!--CHOOSE IF THE SERVER BY DEFAULT IS ENABLED TO SEND STATIC
-			FILES-->
-	<ALLOW_SEND_FILE>YES</ALLOW_SEND_FILE>
-
 	<!--MAXIMUM NUMBER OF EXTERNAL SERVERS THAT CAN BE EXECUTED-->
-	<MAX_SERVERS_PROCESSES>100</MAX_SERVERS_PROCESSES>
+	<DEFINE name="server.max_servers" value="100" />
 
-	<!--INITIAL PORT TO BIND FOR EXERNAL SERVERS-->
-	<SERVERS_PROCESSES_INITIAL_PORT>3333</SERVERS_PROCESSES_INITIAL_PORT>
-
   <!--SET HERE THE NAME FOR THE CONTROL ADMIN. WE SUGGEST YOU YO USE
       SOMETHING DIFFERENT FROM ADMIN, ADMINISTRATOR OR ROOT-->
-  <CONTROL_ADMIN>ADMIN</CONTROL_ADMIN>
+  <DEFINE name="control.admin" value="ADMIN" />
 
   <!--DEFINE HERE A GOOD STRONG PASSWORD FOR THE ADMIN-->
-  <CONTROL_PASSWORD>PLEASE_CHANGE_THIS_PASSWORD</CONTROL_PASSWORD>
+  <DEFINE name="control.password" value="PLEASE_CHANGE_THIS_PASSWORD" />
 
   <!--FTP GLOBAL CONFIGURATION-->
   <!--ALLOW ANONYMOUS LOGIN-->
-  <ALLOW_ANONYMOUS>NO</ALLOW_ANONYMOUS>
+  <DEFINE name="ftp.allow_anonymous" value="NO" />
+
   <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
-  <ANONYMOUS_NEED_PASS>YES</ANONYMOUS_NEED_PASS>
+  <DEFINE name="ftp.anonymous_need_pass" value="NO" />
+
   <!--ALLOW ASYNCHRONOUS CMDS LIKE Abor, Quit, Stat-->
-  <ALLOW_ASYNCHRONOUS_CMDS>YES</ALLOW_ASYNCHRONOUS_CMDS>
+  <DEFINE name="ftp.allow_asynchronous_cmds" value="YES" />
+
   <!--ALLOW CLIENTS TO SEND MORE THAN ONE COMMAND TO SERVER INTO ONE REQUEST-->
-  <ALLOW_PIPELINING>YES</ALLOW_PIPELINING>
+  <DEFINE name="ftp.allow_pipelining" value="NO" />
+
   <!--ALLOW CLIENTS TO CHANGE SERVER FILES-->
-  <ALLOW_STORE>NO</ALLOW_STORE>
+  <DEFINE name="ftp.allow_store" value="NO" />
 </MYSERVER>

Modified: trunk/myserver/documentation/basic_configuration.texi
===================================================================
--- trunk/myserver/documentation/basic_configuration.texi	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/documentation/basic_configuration.texi	2009-03-01 17:57:42 UTC (rev 3017)
@@ -26,16 +26,12 @@
 
 @section Message localization
 It is possible to change the localization for some MyServer messages
-changing the @code{LANGUAGE} value in the @file{myserver.xml} file.
+changing the @code{server.language} value in the @file{myserver.xml} file.
 By default the english language is used, the value specified here must
 refer to a xml file contained in the @file{languages/} directory.
 
 @section Server administrator
 CGI scripts can get the server administrator e-mail and show them to
-the user (through the SERVER_ADMIN environment variable). So, it can
-be important you define this address properly, by setting the value in
-the line below, in @file{myserver.xml}:
-
-@example
-<SERVER_ADMIN>root@@foo.com</SERVER_ADMIN>
-@end example
+the user (through the SERVER_ADMIN environment variable). 
+It is defined trought the @code{server.admin} variable, that can be
+set in the global configuration file or for virtual host.

Modified: trunk/myserver/documentation/directory_listing.texi
===================================================================
--- trunk/myserver/documentation/directory_listing.texi	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/documentation/directory_listing.texi	2009-03-01 17:57:42 UTC (rev 3017)
@@ -67,5 +67,5 @@
 configure the layout for the browsing directory pages:
 
 @example
-<BROWSEFOLDER_CSS>system/folderstyle.css</BROWSEFOLDER_CSS>
+  <DEFINE name="http.dir.css" value="/sys/css/browsestyle.css" />
 @end example

Modified: trunk/myserver/documentation/error_pages.texi
===================================================================
--- trunk/myserver/documentation/error_pages.texi	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/documentation/error_pages.texi	2009-03-01 17:57:42 UTC (rev 3017)
@@ -5,13 +5,13 @@
 option:
 
 @example
-<USE_ERROR_FILE>YES</USE_ERROR_FILE>
+	<DEFINE name="http.use_error_file" value="YES" />
 @end example
 
 So, if you set the value to @code{NO}, like in the line below,
 
 @example
-<USE_ERROR_FILE>NO</USE_ERROR_FILE>
+	<DEFINE name="http.use_error_file" value="NO" />
 @end example
 
 If an error page is not used MyServer will (by default) just send a
@@ -19,5 +19,5 @@
 It is possible to include a HTTP body in the error page, using:
 
 @example
-<ERRORS_INCLUDE_BODY>YES</ERRORS_INCLUDE_BODY>
+  <DEFINE name="http.error_body" value="YES" />
 @end example

Modified: trunk/myserver/documentation/mime_types.texi
===================================================================
--- trunk/myserver/documentation/mime_types.texi	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/documentation/mime_types.texi	2009-03-01 17:57:42 UTC (rev 3017)
@@ -131,7 +131,7 @@
 line in the @file{myserver.xml} file.
 
 @example
-<FOLLOW_LINKS>YES</FOLLOW_LINKS>
+	<DEFINE name="symlinks.follow" value="YES" />
 @end example
 
 By default MyServer doesn't follow symbolic links.

Modified: trunk/myserver/documentation/process_security.texi
===================================================================
--- trunk/myserver/documentation/process_security.texi	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/documentation/process_security.texi	2009-03-01 17:57:42 UTC (rev 3017)
@@ -7,14 +7,14 @@
 the @file{myserver.xml} file as:
 
 @example
-<PROCESS_USER_ID>PID</PROCESS_USER_ID>
+<DEFINE name="server.uid" value="UID" />
 @end example
 
 Differently, to change the process group id (GID), the configuration
 line to use is:
 
 @example
-<PROCESS_GROUP_ID>GID</PROCESS_GROUP_ID>
+<DEFINE name="server.gid" value="GID" />
 @end example
 
 When one of these features is used, MyServer will not use the

Modified: trunk/myserver/include/protocol/http/http.h
===================================================================
--- trunk/myserver/include/protocol/http/http.h	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/include/protocol/http/http.h	2009-03-01 17:57:42 UTC (rev 3017)
@@ -1,7 +1,7 @@
 /* -*- mode: c++ -*- */
 /*
 MyServer
-Copyright (C) 2002-2008 Free Software Foundation, Inc.
+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
@@ -57,8 +57,6 @@
     clearMulticastRegistry();
   }
 
-  string browseDirCSSpath;
-  u_long gzipThreshold;
   vector<string> defaultFilename;
   int cgiTimeout;
   int allowVhostMime;
@@ -173,8 +171,6 @@
   int sendHTTPNonModified();
   Http();
   virtual ~Http();
-  const char* getBrowseDirCSSFile();
-  u_long getGzipThreshold();
   virtual char* registerName(char* out,int len){return registerNameImpl(out, len);}
 
   static char* registerNameImpl(char*, int len);

Modified: trunk/myserver/include/server/server.h
===================================================================
--- trunk/myserver/include/server/server.h	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/include/server/server.h	2009-03-01 17:57:42 UTC (rev 3017)
@@ -1,7 +1,7 @@
 /* -*- mode: c++ -*- */
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 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
@@ -34,9 +34,6 @@
 #include <include/log/log_manager.h>
 #include <include/filter/filters_factory.h>
 #include <include/plugin/plugins_manager.h>
-//#include <include/plugin/filter/dyn_filters_manager.h>
-//#include <include/plugin/filter/dyn_filter.h>
-//#include <include/plugin/executor/dyn_executor_manager.h>
 #include <include/base/hash_map/hash_map.h>
 #include <include/base/home_dir/home_dir.h>
 #include <include/base/files_cache/cached_file_factory.h>
@@ -124,7 +121,6 @@
   const char *getDefaultFilenamePath(u_long ID = 0);
   const char *getServerName();
   u_long getVerbosity();
-  const char *getServerAdmin();
   int getMaxLogFileSize();
   int mustUseLogonOption();
   void setVerbosity(u_long);
@@ -184,6 +180,7 @@
   /*! Do not allow to create directly objects.  */
   Server();
 
+  void readHashedData (xmlNodePtr lcur);
   void mainLoop();
   void loadPlugins();
   void displayBoot();
@@ -199,8 +196,6 @@
   HashMap<string, string*> hashedData;
   HashMap<string, void*> globalData;
   FiltersFactory filtersFactory;
-  //DynamicFiltersManager filters;
-  //DynExecutorManager executors;
   u_long uid;
   u_long gid;
   int currentThreadID;
@@ -218,12 +213,12 @@
   u_long throttlingRate;
   u_long buffersize;
   u_long secondaryBufferSize;
-  /*! Buffer that contains all the local machine IP values.  */
+
+  /* Buffer that contains all the local machine IP values.  */
   string *ipAddresses;
   char serverName[HOST_NAME_MAX + 1];
   string* path;
   string* externalPath;
-  string* serverAdmin;
   int initialize();
   int addThread(bool staticThread = false);
   ConnectionPtr addConnectionToList(Socket* s, MYSERVER_SOCKADDRIN *asock_in,

Modified: trunk/myserver/src/conf/vhost/vhost.cpp
===================================================================
--- trunk/myserver/src/conf/vhost/vhost.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/conf/vhost/vhost.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -201,17 +201,6 @@
   IpRange *pNewRange = IpRange::RangeFactory(sTempIp);
   if ( pNewRange != NULL )
     ipListAllow.push_back(pNewRange);
-
-  /* old code
-  StringRegex* sr = new StringRegex();
-  if(sr == 0)
-    return;
-  sr->name.assign(ip);
-  / * If is a regular expression, the ip string is a pattern.  * /
-  if(isRegex)
-    sr->regex.compile(ip, REG_EXTENDED);
-  ipList.push_back(sr);
-  */
 }
 
 /*!

Modified: trunk/myserver/src/http_handler/http_dir/http_dir.cpp
===================================================================
--- trunk/myserver/src/http_handler/http_dir/http_dir.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/http_handler/http_dir/http_dir.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -386,8 +386,10 @@
       sort (files.begin(), files.end(), compareFileStructByName);
   }
 
-  browseDirCSSpath = td->http->getBrowseDirCSSFile();
+  browseDirCSSpath = td->securityToken.getHashedData ("http.dir.css",                                                               MYSERVER_SECURITY_CONF | MYSERVER_VHOST_CONF |
+                                                      MYSERVER_SERVER_CONF, NULL);
 
+
   td->secondaryBuffer->setLength(0);
   *td->secondaryBuffer << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
     "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n"
@@ -401,14 +403,13 @@
    *If it is defined a CSS file for the graphic layout of 
    *the browse directory insert it in the page.  
    */
-  if(browseDirCSSpath != 0)
+  if(browseDirCSSpath)
   {
     *td->secondaryBuffer << "<link rel=\"stylesheet\" href=\""
                  << browseDirCSSpath 
                  << "\" type=\"text/css\" media=\"all\"/>\r\n";
   }
 
-
   *td->secondaryBuffer << "</head>\r\n"; 
 
   ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
@@ -425,8 +426,6 @@
 
   sentData = td->secondaryBuffer->getLength();
               
-  browseDirCSSpath = td->http->getBrowseDirCSSFile();
-
   filename = directory;
   td->secondaryBuffer->setLength(0);
   *td->secondaryBuffer << "<body>\r\n<h1>Contents of directory ";

Modified: trunk/myserver/src/http_handler/http_file/http_file.cpp
===================================================================
--- trunk/myserver/src/http_handler/http_file/http_file.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/http_handler/http_file/http_file.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -146,11 +146,16 @@
       /* 
        *Use GZIP compression to send files bigger than GZIP threshold.  
        */
-      const char* val = s->host->getHashedData("GZIP_THRESHOLD");
+      const char *val = td->securityToken.getHashedData ("gzip.threshold", 
+                                                         MYSERVER_SECURITY_CONF | 
+                                                         MYSERVER_VHOST_CONF |
+                                                         MYSERVER_MIME_CONF |
+                                                         MYSERVER_SERVER_CONF, "0");
+
       useGzip = false;
-      if(val)
+      if (val)
       {
-        u_long gzipThreshold = atoi(val);
+        u_long gzipThreshold = atoi (val);
         if(bytesToSend >= gzipThreshold)
           useGzip = true;
       }

Modified: trunk/myserver/src/protocol/control/control_protocol.cpp
===================================================================
--- trunk/myserver/src/protocol/control/control_protocol.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/protocol/control/control_protocol.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2007, 2008, 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
@@ -108,13 +108,9 @@
   /* Is the value in the config file still in MD5?  */
   int adminPasswordMD5ized = 0;
 
-  char *data = 0;
-  const char *mainConfigurationFile = Server::getInstance()->getMainConfFile();
-  XmlParser configurationFileManager;
+  const char *data = 0;
 
-  configurationFileManager.open(mainConfigurationFile);
-
-  data=configurationFileManager.getValue("CONTROL_ENABLED");
+  data = Server::getInstance()->getHashedData ("control.enabled");
   if(data && (!strcmpi(data, "YES")))
   {
     controlEnabled = 1;
@@ -124,26 +120,26 @@
     controlEnabled = 0;
   }
 
-  data = configurationFileManager.getValue("CONTROL_ADMIN");
+  data = Server::getInstance()->getHashedData ("control.admin");
   if(data)
   {
     strncpy(tmpName, data, 64);
   }  
 
-  data = configurationFileManager.getValue("CONTROL_PASSWORD");
+  data = Server::getInstance()->getHashedData ("control.password");
   if(data)
   {
     strncpy(tmpPassword, data, 64);
   }  
 
-  data = configurationFileManager.getAttr("CONTROL_ADMIN", "MD5");
+  data = Server::getInstance()->getHashedData ("control.admin.md5");
   if(data)
   {
     if(strcmpi(data, "YES") == 0)
       adminNameMD5ized = 1;
   }  
 
-  data = configurationFileManager.getAttr("CONTROL_PASSWORD", "MD5");
+  data = Server::getInstance()->getHashedData ("control.password.md5");
   if(data)
   {
     if(strcmpi(data, "YES") == 0)
@@ -172,7 +168,6 @@
     md5.end(adminPassword);
   }
 
-  configurationFileManager.close();
   return 0;
 }
 

Modified: trunk/myserver/src/protocol/ftp/ftp.cpp
===================================================================
--- trunk/myserver/src/protocol/ftp/ftp.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -381,35 +381,33 @@
 int Ftp::loadProtocolStatic(XmlParser*)
 {
   // load custom messages from cfg here
-  XmlParser *configurationFileManager = Server::getInstance()->getConfiguration();
+  Server *server = Server::getInstance ();
 
-  if ( configurationFileManager == NULL )
-    return 0;
-
   // allow anonymous access
-  char *pData = configurationFileManager->getValue("ALLOW_ANONYMOUS");
+  const char *pData = server->getHashedData ("ftp.allow_anonymous");
   if ( pData != NULL )
     m_bAllowAnonymous = strcmpi("Yes", pData) == 0 ? true : false;
 
   // request password for anonymous
-  pData = configurationFileManager->getValue("ANONYMOUS_NEED_PASS");
+  pData = server->getHashedData ("ftp.anonymous_need_pass");
   if ( pData != NULL )
     m_bAnonymousNeedPass = strcmpi("Yes", pData) == 0 ? true : false;
 
   // enable asyncronous cmds
-  pData = configurationFileManager->getValue("ALLOW_ASYNCHRONOUS_CMDS");
+  pData = server->getHashedData ("ftp.allow_asynchronous_cmds");
   if ( pData != NULL )
     m_bAllowAsynchronousCmds = strcmpi("Yes", pData) == 0 ? true : false;
 
   // enable pipelining
-  pData = configurationFileManager->getValue("ALLOW_PIPELINING");
+  pData = server->getHashedData ("ftp.allow_pipelining");
   if ( pData != NULL )
     m_bEnablePipelining = strcmpi("Yes", pData) == 0 ? true : false;
 
-  // enable write commands
-  pData = configurationFileManager->getValue("ALLOW_STORE");
+  // enable write commands 
+  pData = server->getHashedData ("ftp.allow_store");
   if ( pData != NULL )
     m_bEnableStoreCmds = strcmpi("Yes", pData) == 0 ? true : false;
+
   return 1;
 }
 

Modified: trunk/myserver/src/protocol/http/env/env.cpp
===================================================================
--- trunk/myserver/src/protocol/http/env/env.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/protocol/http/env/env.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 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
@@ -80,7 +80,9 @@
   memCgi << end_str << "SERVER_PORT="<< portBuffer;
 
   memCgi << end_str << "SERVER_ADMIN=";
-  memCgi << Server::getInstance()->getServerAdmin();
+  memCgi << td->securityToken.getHashedData ("server.admin", 
+                                             MYSERVER_VHOST_CONF |
+                                             MYSERVER_SERVER_CONF, "");
 
   memCgi << end_str << "REQUEST_METHOD=";
   memCgi << td->request.cmd.c_str();

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/protocol/http/http.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -222,8 +222,9 @@
  */
 bool Http::allowHTTPTRACE()
 {
-  const char *allowTrace = td->securityToken.getHashedData ("http.allow_trace", MYSERVER_VHOST_CONF |
-                                                              MYSERVER_SERVER_CONF, "NO");
+  const char *allowTrace = td->securityToken.getHashedData ("http.allow_trace", 
+                                                            MYSERVER_VHOST_CONF |
+                                                            MYSERVER_SERVER_CONF, "NO");
 
   if (!strcmpi (allowTrace, "YES"))
     return true;
@@ -249,6 +250,7 @@
   int permissions = -1;
   int keepalive = 0;
   int ret;
+
   try
   {
     HttpHeaders::buildDefaultHTTPResponseHeader(&td->response);
@@ -423,10 +425,9 @@
 
     if (FilesUtility::isLink (td->filenamePath.c_str()))
     {
-      const char *perm = td->securityToken.getHashedData ("FOLLOW_LINKS", MYSERVER_VHOST_CONF |
-							  MYSERVER_SERVER_CONF, "NO");
+      const char *perm = td->securityToken.getHashedData ("symlinks.follow", MYSERVER_VHOST_CONF |
+                                                          MYSERVER_SERVER_CONF, "NO");
 
-
       if(!perm || strcmpi(perm, "YES"))
         return raiseHTTPError(401);
     }
@@ -485,7 +486,8 @@
 
     SecurityDomain* domains[] = {&auth, &httpReqSecDom, NULL};
 
-    Server::getInstance()->getSecurityManager ()->getPermissionMask (&(td->securityToken), domains, 
+    Server::getInstance()->getSecurityManager ()->getPermissionMask (&(td->securityToken), 
+                                                                     domains, 
                                                                      validator, authMethod);
 
     const char *authType = td->securityToken.getHashedData ("http.auth", MYSERVER_SECURITY_CONF |
@@ -524,9 +526,10 @@
     return 500;
   }
 
-  const char *tr = td->securityToken.getHashedData ("connection.throttling", MYSERVER_SECURITY_CONF |
-                                                MYSERVER_VHOST_CONF |
-                                                MYSERVER_SERVER_CONF);
+  const char *tr = td->securityToken.getHashedData ("connection.throttling", 
+                                                    MYSERVER_SECURITY_CONF |
+                                                    MYSERVER_VHOST_CONF |
+                                                    MYSERVER_SERVER_CONF);
 
   /*! If a throttling rate was specifed use it.  */
   if(tr)
@@ -1223,91 +1226,95 @@
 
         if(documentRoot.length())
         {
-          const char *useHomeDir = td->securityToken.getHashedData ("USE_HOME_DIRECTORY", MYSERVER_VHOST_CONF |
-								    MYSERVER_SERVER_CONF, "YES");
+          const char *useHomeDir = td->securityToken.getHashedData ("http.use_home_directory", 
+                                                                    MYSERVER_VHOST_CONF |
+                                                                    MYSERVER_SERVER_CONF, "YES");
 
 
-	  const char *homeDir = td->securityToken.getHashedData ("HOME_DIRECTORY", MYSERVER_VHOST_CONF |
-								 MYSERVER_SERVER_CONF, "public_html");
+          const char *homeDir = td->securityToken.getHashedData ("http.home_directory", 
+                                                                 MYSERVER_VHOST_CONF |
+                                                                 MYSERVER_SERVER_CONF, 
+                                                                 "public_html");
 
 	  if (strcmpi (useHomeDir, "YES"))
 	    return raiseHTTPError (404);
 
-          td->vhostDir.assign (documentRoot);
-          td->vhostDir.append ("/");
-          td->vhostDir.append (homeDir);
-
-          if(!td->request.uriEndsWithSlash && !(td->request.uri.length() - pos))
-          {
-            td->request.uri.append("/");
-
-            return sendHTTPRedirect(td->request.uri.c_str());
-          }
-
-          if(td->request.uri.length() - pos)
-            td->request.uri.assign(td->request.uri.substr(pos,
-                                td->request.uri.length()));
+    td->vhostDir.assign (documentRoot);
+    td->vhostDir.append ("/");
+    td->vhostDir.append (homeDir);
+    
+    if(!td->request.uriEndsWithSlash && !(td->request.uri.length() - pos))
+      {
+        td->request.uri.append("/");
+        
+        return sendHTTPRedirect(td->request.uri.c_str());
+      }
+    
+    if(td->request.uri.length() - pos)
+      td->request.uri.assign(td->request.uri.substr(pos,
+                                                    td->request.uri.length()));
           else
             td->request.uri.assign("");
         }
       }
-
+      
       /*!
        *Check if there is a limit for the number of connections in the
        *virtual host A value of zero means no limit.
        */
       {
-        const char* val = td->securityToken.getHashedData ("MAX_CONNECTIONS", MYSERVER_VHOST_CONF |
-							   MYSERVER_SERVER_CONF, NULL);
-
+        const char* val = td->securityToken.getHashedData ("MAX_CONNECTIONS", 
+                                                           MYSERVER_VHOST_CONF |
+                                                           MYSERVER_SERVER_CONF, NULL);
+        
         if(val)
-        {
-          u_long limit = (u_long)atoi(val);
-          if(limit && (u_long)a->host->getRef() >= limit)
           {
-            retvalue = raiseHTTPError(500);
-            logHTTPaccess();
-            return retvalue ? ClientsThread::KEEP_CONNECTION
-                            : ClientsThread::DELETE_CONNECTION;
+            u_long limit = (u_long)atoi(val);
+            if(limit && (u_long)a->host->getRef() >= limit)
+              {
+                retvalue = raiseHTTPError(500);
+                logHTTPaccess();
+                return retvalue ? ClientsThread::KEEP_CONNECTION
+                  : ClientsThread::DELETE_CONNECTION;
+              }
           }
-        }
       }
-
+      
       if(td->request.isKeepAlive())
-      {
-        /*!
-         *Support for HTTP pipelining.
-         */
-        if(contentLength == 0)
         {
           /*!
-           *connectionBuffer is 8 KB, so don't copy more bytes.
+           *Support for HTTP pipelining.
            */
-          u_long bufferStrLen = strlen(td->buffer->getBuffer());
-          u_long remainingData = 0;
-
-          if(bufferStrLen - td->nHeaderChars >= MYSERVER_KB(8))
-            remainingData = MYSERVER_KB(8);
-          else 
-            remainingData = bufferStrLen - td->nHeaderChars;
-
-          if(remainingData)
-          {
-            u_long toCopy = nbtr - td->nHeaderChars;
-            a->connectionBuffer.setBuffer((td->buffer->getBuffer() + td->nHeaderChars), toCopy);
-            retvalue = ClientsThread::INCOMPLETE_REQUEST_NO_WAIT;
-          }
+          if(contentLength == 0)
+            {
+              /*!
+               *connectionBuffer is 8 KB, so don't copy more bytes.
+               */
+              u_long bufferStrLen = strlen(td->buffer->getBuffer());
+              u_long remainingData = 0;
+              
+              if(bufferStrLen - td->nHeaderChars >= MYSERVER_KB(8))
+                remainingData = MYSERVER_KB(8);
+              else 
+                remainingData = bufferStrLen - td->nHeaderChars;
+              
+              if(remainingData)
+                {
+                  u_long toCopy = nbtr - td->nHeaderChars;
+                  a->connectionBuffer.setBuffer((td->buffer->getBuffer() + td->nHeaderChars), 
+                                                toCopy);
+                  retvalue = ClientsThread::INCOMPLETE_REQUEST_NO_WAIT;
+                }
+              else
+                retvalue = ClientsThread::KEEP_CONNECTION;
+            }
           else
             retvalue = ClientsThread::KEEP_CONNECTION;
-
         }
-        else
-          retvalue = ClientsThread::KEEP_CONNECTION;
-      }
       else
-      {
-        retvalue = ClientsThread::DELETE_CONNECTION;
-      }
+        {
+          retvalue = ClientsThread::DELETE_CONNECTION;
+        }
 
       /*!
        *Set the throttling rate for the socket. This setting can be
@@ -1559,8 +1566,9 @@
     int useMessagesFiles = 1;
     HttpRequestHeader::Entry *host = td->request.other.get("Host");
     HttpRequestHeader::Entry *connection = td->request.other.get("Connection");
-    const char *useMessagesVal = td->securityToken.getHashedData ("USE_ERROR_FILE", MYSERVER_VHOST_CONF |
-								  MYSERVER_SERVER_CONF, NULL);
+    const char *useMessagesVal = td->securityToken.getHashedData ("http.use_error_file", 
+                                                                  MYSERVER_VHOST_CONF |
+                                                                 MYSERVER_SERVER_CONF, NULL);
 
     if(useMessagesVal)
     {
@@ -1590,7 +1598,8 @@
     char errorName [32];
     sprintf (errorName, "http.error.file.%i", ID);
 
-    const char *defErrorFile = td->securityToken.getHashedData (errorName, MYSERVER_SECURITY_CONF |
+    const char *defErrorFile = td->securityToken.getHashedData (errorName, 
+                                                                MYSERVER_SECURITY_CONF |
                                                                 MYSERVER_VHOST_CONF |
                                                                 MYSERVER_SERVER_CONF);
 
@@ -1654,7 +1663,8 @@
 
     /*! Send only the header (and the body if specified). */
     {
-      const char* value = td->securityToken.getHashedData ("USE_ERROR_FILE", MYSERVER_VHOST_CONF |
+      const char* value = td->securityToken.getHashedData ("http.error_body", 
+                                                           MYSERVER_VHOST_CONF |
 							   MYSERVER_SERVER_CONF, NULL);
 
       if(value && !strcmpi(value, "NO"))
@@ -1906,22 +1916,6 @@
 }
 
 /*!
- *Get the CSS file used in a browsed directory.
- */
-const char* Http::getBrowseDirCSSFile()
-{
-  return staticHttp.browseDirCSSpath.c_str();
-}
-
-/*!
- *Get the GZIP threshold.
- */
-u_long Http::getGzipThreshold()
-{
-  return staticHttp.gzipThreshold;
-}
-
-/*!
  *Send a redirect message to the client.
  */
 int Http::sendHTTPRedirect(const char *newURL)
@@ -2013,8 +2007,6 @@
    *By default use GZIP with files bigger than a MB.
    */
   staticHttp.cgiTimeout = MYSERVER_SEC(15);
-  staticHttp.gzipThreshold = 1 << 20;
-  staticHttp.browseDirCSSpath.assign("");
 
   Server::getInstance()->setGlobalData("http-static", getStaticData());
 
@@ -2045,31 +2037,20 @@
   staticHttp.dynManagerList.addHttpManager ("FASTCGI", staticHttp.fastcgi);
   staticHttp.dynManagerList.addHttpManager ("ISAPI", staticHttp.isapi);
 
-  /* Determine the min file size that will use GZIP compression.  */
-  data = configurationFileManager->getValue("GZIP_THRESHOLD");
+  data = configurationFileManager->getValue("vhost.allow_mime");
   if(data)
   {
-    staticHttp.gzipThreshold = atoi(data);
-  }
-  data = configurationFileManager->getValue("ALLOW_VHOST_MIME");
-  if(data)
-  {
 
     if(!strcmpi(data, "YES"))
       staticHttp.allowVhostMime = 1;
     else
       staticHttp.allowVhostMime = 0;
   }
-  data = configurationFileManager->getValue("CGI_TIMEOUT");
+  data = configurationFileManager->getValue("cgi.timeout");
   if(data)
   {
     staticHttp.cgiTimeout = MYSERVER_SEC(atoi(data));
   }
-  data = configurationFileManager->getValue("BROWSEFOLDER_CSS");
-  if(data)
-  {
-    staticHttp.browseDirCSSpath.append(data);
-  }
 
   Cgi::setTimeout(staticHttp.cgiTimeout);
   Scgi::setTimeout(staticHttp.cgiTimeout);
@@ -2134,7 +2115,6 @@
   HttpDir::unLoad();
 
   staticHttp.defaultFilename.clear();
-  staticHttp.browseDirCSSpath.assign("");
 
   staticHttp.clear();
 
@@ -2144,7 +2124,7 @@
 /*!
  *Returns the default filename.
  */
-const char *Http::getDefaultFilenamePath(u_long ID)
+const char *Http::getDefaultFilenamePath (u_long ID)
 {
   if(staticHttp.defaultFilename.size() <= ID)
     return 0;

Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp	2009-02-27 19:47:06 UTC (rev 3016)
+++ trunk/myserver/src/server/server.cpp	2009-03-01 17:57:42 UTC (rev 3017)
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2002-2008 Free Software Foundation, Inc.
+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
@@ -78,7 +78,6 @@
   throttlingRate = 0;
   uid = 0;
   gid = 0;
-  serverAdmin = 0;
   mimeManager = 0;
   mimeConfigurationFile = 0;
   mainConfigurationFile = 0;
@@ -260,10 +259,6 @@
   if(vhostList)
     delete vhostList;
 
-  if(serverAdmin)
-    delete serverAdmin;
-  serverAdmin = 0;
-
   delete vhostConfigurationFile;
   vhostConfigurationFile = 0;
 
@@ -968,22 +963,13 @@
 }
 
 /*!
- *Get the server administrator e-mail address.
- *To change this use the main configuration file.
- */
-const char *Server::getServerAdmin()
-{
-  return serverAdmin ? serverAdmin->c_str() : "";
-}
-
-/*!
  *Here is loaded the configuration of the server.
  *The configuration file is a XML file.
  *Return nonzero on errors.
  */
 int Server::initialize()
 {
-  char *data;
+  const char *data;
 #ifdef WIN32
   envString = GetEnvironmentStrings();
 #endif
@@ -1003,13 +989,12 @@
   throttlingRate = 0;
   maxConnections = 0;
   maxConnectionsToAccept = 0;
-  if(serverAdmin)
-    delete serverAdmin;
-  serverAdmin = 0;
 
   if(configurationFileManager.open(mainConfigurationFile->c_str()))
     return -1;
 
+  readHashedData (xmlDocGetRootElement(configurationFileManager.getDoc())->xmlChildrenNode);
+
   /*
    * Process console colors information.
    */
@@ -1032,7 +1017,7 @@
 
   initLogManager ();
 
-  data = configurationFileManager.getValue("LANGUAGE");
+  data = getHashedData ("server.language");
   if(languageFile)
     delete languageFile;
   languageFile = new string();
@@ -1056,78 +1041,69 @@
   }
   logWriteln(languageParser.getValue("MSG_LANGUAGE"));
 
-  data = configurationFileManager.getValue("VERBOSITY");
+  data = getHashedData ("server.verbosity");
   if(data)
   {
     verbosity = (u_long)atoi(data);
   }
 
 
-  data = configurationFileManager.getValue("BUFFER_SIZE");
+  data = configurationFileManager.getValue("server.buffer_size");
   if(data)
   {
     buffersize=secondaryBufferSize= (atol(data) > 81920) ?  atol(data) :  81920 ;
   }
-  data = configurationFileManager.getValue("CONNECTION_TIMEOUT");
+  data = configurationFileManager.getValue("server.connection_timeout");
   if(data)
   {
     connectionTimeout = MYSERVER_SEC((u_long)atol(data));
   }
 
-  data = configurationFileManager.getValue("NTHREADS_STATIC");
+  data = configurationFileManager.getValue("server.static_threads");
   if(data)
   {
     nStaticThreads = atoi(data);
   }
-  data = configurationFileManager.getValue("NTHREADS_MAX");
+  data = configurationFileManager.getValue("server.max_threads");
   if(data)
   {
     nMaxThreads = atoi(data);
   }
 
   /* Get the max connections number to allow.  */
-  data = configurationFileManager.getValue("MAX_CONNECTIONS");
+  data = configurationFileManager.getValue("server.max_connections");
   if(data)
   {
     maxConnections = atoi(data);
   }
 
   /* Get the max connections number to accept.  */
-  data = configurationFileManager.getValue("MAX_CONNECTIONS_TO_ACCEPT");
+  data = configurationFileManager.getValue("server.max_accepted_connections");
   if(data)
   {
     maxConnectionsToAccept = atoi(data);
   }
 
   /* Get the default throttling rate to use on connections.  */
-  data = configurationFileManager.getValue("THROTTLING_RATE");
+  data = configurationFileManager.getValue("connection.throttling");
   if(data)
   {
     throttlingRate = (u_long)atoi(data);
   }
 
-  /* Load the server administrator e-mail.  */
-  data = configurationFileManager.getValue("SERVER_ADMIN");
+  data = configurationFileManager.getValue("connection.timeout");
   if(data)
   {
-    if(serverAdmin == 0)
-      serverAdmin = new string();
-    serverAdmin->assign(data);
-  }
-
-  data = configurationFileManager.getValue("CONNECTION_TIMEOUT");
-  if(data)
-  {
     connectionTimeout=MYSERVER_SEC((u_long)atol(data));
   }
 
-  data = configurationFileManager.getValue("MAX_LOG_FILE_SIZE");
+  data = configurationFileManager.getValue("server.max_log_size");
   if(data)
   {
     maxLogFileSize=(u_long)atol(data);
   }
 
-  data = configurationFileManager.getValue("MAX_FILESCACHE_SIZE");
+  data = configurationFileManager.getValue("server.max_files_cache");
   if(data)
   {
     u_long maxSize = (u_long)atol(data);
@@ -1136,7 +1112,7 @@
   else
     cachedFiles.initialize(1 << 23);
 
-  data = configurationFileManager.getValue("TEMP_DIRECTORY");
+  data = configurationFileManager.getValue("server.temp_directory");
   if (data)
   {
     string tmpPath (data);
@@ -1146,60 +1122,78 @@
   else
     FilesUtility::resetTmpPath ();
 
-  data = configurationFileManager.getValue("MAX_FILESCACHE_FILESIZE");
+  data = configurationFileManager.getValue("server.max_file_cache");
   if(data)
   {
     u_long maxSize = (u_long)atol(data);
     cachedFiles.setMaxSize(maxSize);
   }
 
-  data = configurationFileManager.getValue("MIN_FILESCACHE_FILESIZE");
+  data = configurationFileManager.getValue("server.min_file_cache");
   if(data)
   {
     u_long minSize = (u_long)atol(data);
     cachedFiles.setMinSize(minSize);
   }
 
-  data = configurationFileManager.getValue("PROCESS_USER_ID");
+  data = configurationFileManager.getValue("server.uid");
   if(data)
   {
     uid = atoi(data);
   }
-  data = configurationFileManager.getValue("PROCESS_GROUP_ID");
+  data = configurationFileManager.getValue("server.gid");
   if(data)
   {
     gid = atoi(data);
   }
 
-  data = configurationFileManager.getValue("MAX_SERVERS_PROCESSES");
+  data = configurationFileManager.getValue("server.max_servers");
   if(data)
   {
     int maxServersProcesses = atoi(data);
     getProcessServerManager()->setMaxServers(maxServersProcesses);
   }
 
-  {
-    xmlNodePtr node =
-      xmlDocGetRootElement(configurationFileManager.getDoc())->xmlChildrenNode;
-    for(;node; node = node->next)
+  return 0;
+}
+
+/*!
+ *Read the values defined in the global configuration file.
+ */
+void Server::readHashedData (xmlNodePtr lcur)
+{
+  xmlAttr *attrs;
+  for(;lcur; lcur = lcur->next)
     {
-      if(node->children && node->children->content)
-      {
-        string* old;
-        string *value = new string((const char*)node->children->content);
-        string key((const char*)node->name);
-        if(value == 0)
-          return -1;
-        old = hashedData.put(key, value);
-        if(old)
+      
+      if (lcur->name && !xmlStrcmp(lcur->name, (const xmlChar *)"DEFINE"))
         {
-          delete old;
+          const char *name = NULL;
+          const char *value = NULL;
+          
+          for (attrs = lcur->properties; attrs; attrs = attrs->next)
+            {
+              if (!xmlStrcmp (attrs->name, (const xmlChar *)"name") && 
+                  attrs->children && attrs->children->content)
+                name = (const char*)attrs->children->content;
+              
+              if (!xmlStrcmp (attrs->name, (const xmlChar *)"value") && 
+                  attrs->children && attrs->children->content)
+                value = (const char*)attrs->children->content;
+            }
+          
+          if(name && value)
+            {
+              string* old;
+              string *v = new string((const char*)value);
+              string key((const char*)name);
+              old = hashedData.put(key, v);
+
+              if(old)
+                delete old;
+            }
         }
-      }
     }
-  }
-
-  return 0;
 }
 
 




From MAILER-DAEMON Sun Mar 01 13:35:44 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LdqVr-0005zg-RK
	for mharc-myserver-commit@gnu.org; Sun, 01 Mar 2009 13:35:43 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LdqVq-0005xG-Ek
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 13:35:42 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LdqVj-0005uI-Hd
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 13:35:41 -0500
Received: from [199.232.76.173] (port=46918 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LdqVj-0005uF-9J
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 13:35:35 -0500
Received: from savannah.gnu.org ([199.232.41.3]:56178 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LdqVh-0002K0-Qu
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 13:35:35 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LdqVg-0003BU-O8
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 18:35:32 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LdqVf-0003A7-Tq
	for myserver-commit@gnu.org; Sun, 01 Mar 2009 18:35:32 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LdqVf-0003A7-Tq@cvs.savannah.gnu.org>
Date: Sun, 01 Mar 2009 18:35:32 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3018] Changed names for default configuration
	files.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2009 18:35:42 -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="administrator@localhost" />
+
+	<!--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="administrator@localhost" />
+
+	<!--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="administrator@localhost" />
-
-	<!--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="administrator@localhost" />
-
-	<!--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);




From MAILER-DAEMON Mon Mar 02 16:27:26 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LeFfa-00083Y-Hg
	for mharc-myserver-commit@gnu.org; Mon, 02 Mar 2009 16:27:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LeFfY-00082E-JW
	for myserver-commit@gnu.org; Mon, 02 Mar 2009 16:27:24 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LeFfX-00081L-Hg
	for myserver-commit@gnu.org; Mon, 02 Mar 2009 16:27:23 -0500
Received: from [199.232.76.173] (port=54105 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LeFfW-000814-IB
	for myserver-commit@gnu.org; Mon, 02 Mar 2009 16:27:23 -0500
Received: from savannah.gnu.org ([199.232.41.3]:38694 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LeFfW-0006kt-0M
	for myserver-commit@gnu.org; Mon, 02 Mar 2009 16:27:22 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LeFfU-0003Fo-Uu
	for myserver-commit@gnu.org; Mon, 02 Mar 2009 21:27:21 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LeFfU-0003Fh-9f
	for myserver-commit@gnu.org; Mon, 02 Mar 2009 21:27:20 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LeFfU-0003Fh-9f@cvs.savannah.gnu.org>
Date: Mon, 02 Mar 2009 21:27:20 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3019] Possibility to disable a specific HTTP
	command.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Mar 2009 21:27:24 -0000

Revision: 3019
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3019
Author:   gscrivano
Date:     2009-03-02 21:27:19 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Possibility to disable a specific HTTP command.

Modified Paths:
--------------
    trunk/myserver/documentation/virtual_hosts.texi
    trunk/myserver/include/protocol/http/http.h
    trunk/myserver/src/protocol/http/http.cpp

Modified: trunk/myserver/documentation/virtual_hosts.texi
===================================================================
--- trunk/myserver/documentation/virtual_hosts.texi	2009-03-01 18:35:31 UTC (rev 3018)
+++ trunk/myserver/documentation/virtual_hosts.texi	2009-03-02 21:27:19 UTC (rev 3019)
@@ -118,15 +118,13 @@
 @file{foo/bar/a/file}, everything that follows @file{foo/bar} will be
 part of @code{PATH_INFO}.
 
-@subsubsection HTTP trace command
-MyServer gives you the option to enable the HTTP TRACE command for
-each virtual host.
+@subsubsection Disable specific HTTP methods
+MyServer gives you the option to enable or disable HTTP methods
+command for each virtual host.  It can be done trought the
+@code{http.COMMAND.allow} variable.
 
-This value can be specified in the global and in the virtual host
-configuration.
+For example, the HTTP TRACE command can be disabled using:
 
 @example
-<DEFINE name="http.allow_trace" value="YES" />
+<DEFINE name="http.trace.allow" value="NO" />
 @end example
-
-By default, it's disabled.

Modified: trunk/myserver/include/protocol/http/http.h
===================================================================
--- trunk/myserver/include/protocol/http/http.h	2009-03-01 18:35:31 UTC (rev 3018)
+++ trunk/myserver/include/protocol/http/http.h	2009-03-02 21:27:19 UTC (rev 3019)
@@ -123,9 +123,6 @@
                       int onlyHeader = 0,
                       int yetMapped = 0);
 
-  bool allowHTTPTRACE();
-
-
   int optionsHTTPRESOURCE(string &filename,
                           int yetMapped = 0);
 
@@ -135,6 +132,8 @@
   int deleteHTTPRESOURCE(string& filename,
                          int yetMapped = 0);
 
+  bool allowMethod(const char *name);
+
   int raiseHTTPError(int ID);
 
   int sendHTTPhardError500();

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp	2009-03-01 18:35:31 UTC (rev 3018)
+++ trunk/myserver/src/protocol/http/http.cpp	2009-03-02 21:27:19 UTC (rev 3019)
@@ -109,7 +109,7 @@
   try
   {
     HttpRequestHeader::Entry *connection = td->request.other.get("Connection");
-    string methods("OPTIONS, GET, POST, HEAD, DELETE, PUT");
+    string methods("OPTIONS, GET, POST, HEAD, DELETE, PUT, TRACE");
 
     HashMap<string, DynamicHttpCommand*>::Iterator it = staticHttp.dynCmdManager.begin();
     while(it != staticHttp.dynCmdManager.end())
@@ -132,17 +132,9 @@
     if(connection && connection->value->length())
       *td->secondaryBuffer << "\r\nConnection:" << connection->value->c_str() << "\r\n";
     *td->secondaryBuffer <<"Content-Length: 0\r\nAccept-Ranges: bytes\r\n";
-    *td->secondaryBuffer << "Allow: " << methods << "\r\n";
+    *td->secondaryBuffer << "Allow: " << methods << "\r\n\r\n";
 
-    /*!
-     *Check if the TRACE command is allowed on the virtual host.
-     */
-    if (allowHTTPTRACE ())
-      *td->secondaryBuffer << ", TRACE\r\n";
-
-    *td->secondaryBuffer << "r\n";
-
-    /*! Send the HTTP header. */
+    /* Send the HTTP header. */
     ret = td->connection->socket->send(td->secondaryBuffer->getBuffer(),
                                       (u_long)td->secondaryBuffer->getLength(), 0);
     if( ret == SOCKET_ERROR )
@@ -180,9 +172,6 @@
     tmp.intToStr(contentLength, tmpStr, 12);
     getRFC822GMTTime(time, HTTP_RESPONSE_DATE_DIM);
 
-    if (!allowHTTPTRACE ())
-      return raiseHTTPError (401);
-
     td->secondaryBuffer->setLength(0);
     *td->secondaryBuffer << "HTTP/1.1 200 OK\r\n";
     *td->secondaryBuffer << "Date: " << time << "\r\n";
@@ -218,18 +207,22 @@
 }
 
 /*!
- *Check if the host allows the HTTP TRACE command.
+ *Check if the method is allowed.
+ *\param method The HTTP method name.
+ *\return true if it is allowed.
  */
-bool Http::allowHTTPTRACE()
+bool Http::allowMethod(const char *method)
 {
-  const char *allowTrace = td->securityToken.getHashedData ("http.allow_trace", 
-                                                            MYSERVER_VHOST_CONF |
-                                                            MYSERVER_SERVER_CONF, "NO");
+  char name[64];
+  sprintf ("http.%s.allow", method);
+  const char *allow = td->securityToken.getHashedData (name, 
+                                                       MYSERVER_VHOST_CONF |
+                                                       MYSERVER_SERVER_CONF, "YES");
 
-  if (!strcmpi (allowTrace, "YES"))
-    return true;
-  else
+  if (!strcmpi (allow, "NO"))
     return false;
+  else
+    return true;
 }
 
 /*!
@@ -1356,10 +1349,9 @@
 
       if(!ret)
       {
-        /*
-         *Here we control all the HTTP commands.
-         */
-        
+        if (!allowMethod (td->request.cmd.c_str ()))
+          return raiseHTTPError (401);
+
         /* GET REQUEST.  */
         if(!td->request.cmd.compare("GET"))
           ret = sendHTTPResource(td->request.uri);




From MAILER-DAEMON Tue Mar 03 08:01:17 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LeUFI-000246-Vr
	for mharc-myserver-commit@gnu.org; Tue, 03 Mar 2009 08:01:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LeUFH-000230-5t
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:01:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LeUFF-00021l-GU
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:01:14 -0500
Received: from [199.232.76.173] (port=34440 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LeUFF-00021Z-4e
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:01:13 -0500
Received: from savannah.gnu.org ([199.232.41.3]:33183 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <dperrone@it.gnu.org>) id 1LeUFE-0007Lm-Dg
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:01:12 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <dperrone@it.gnu.org>) id 1LeUFD-00042x-9c
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 13:01:11 +0000
Received: from dperrone by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <dperrone@savannah.gnu.org>) id 1LeUFC-00042t-Vl
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 13:01:11 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: dperrone
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Daniele Perrone <dperrone@it.gnu.org>
Message-Id: <E1LeUFC-00042t-Vl@cvs.savannah.gnu.org>
Date: Tue, 03 Mar 2009 13:01:11 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3020] added command to package plugin sources.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Mar 2009 13:01:15 -0000

Revision: 3020
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3020
Author:   dperrone
Date:     2009-03-03 13:01:10 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
added command to package plugin sources.

Modified Paths:
--------------
    trunk/plugins/SConstruct

Modified: trunk/plugins/SConstruct
===================================================================
--- trunk/plugins/SConstruct	2009-03-02 21:27:19 UTC (rev 3019)
+++ trunk/plugins/SConstruct	2009-03-03 13:01:10 UTC (rev 3020)
@@ -73,7 +73,7 @@
 def tar_package(src_dir, name, filename):
     import tarfile
     tarf = tarfile.open(filename.encode("ascii"),"w|gz")
-    tarf.add(src_dir + name,name)
+    tarf.add(src_dir,name)
     tarf.close()
 
 def build_plugin(name):
@@ -89,13 +89,30 @@
     doc = xml.dom.minidom.parse(bin_dir + name + "/plugin.xml")
     version = doc.getElementsByTagName("VERSION")
     filename = name + "-" + version[0].firstChild.data + "-" + arch + ".tar.gz"
-    tar_package(bin_dir, name, release_dir + filename)	
+    tar_package(bin_dir + name, name, release_dir + filename)	
     
+def pack_source(name):
+    doc = xml.dom.minidom.parse(src_dir + name + "/plugin.xml")
+    version = doc.getElementsByTagName("VERSION")
+    filename = name + "-" + version[0].firstChild.data + "-src.tar.gz"
+    import tempfile
+    import os
+    temp = tempfile.mkdtemp()
+    import shutil
+    shutil.copytree(os.path.join(src_dir, name),os.path.join(temp,src_dir, name))
+    shutil.rmtree(os.path.join(temp,src_dir, name,".svn"))
+    shutil.copy("SConstruct",temp)
+    tar_package(temp, name, release_dir + filename)
+    shutil.rmtree(temp)
+     
 
-
 def pack_plugins(plugins):
     for name in plugins:
 		pack_plugin(name)
+		
+def pack_sources(plugins):
+    for name in plugins:
+		pack_source(name)
 
 
 env = Environment(CPPPATH=listinc,CXXFLAGS="-fPIC -DPIC  -DHAVE_CONFIG_H",
@@ -113,11 +130,10 @@
 
 if command=='build':
 	build_plugins(plugins)
-
-
-
-if command=='package':
+elif command=='package':
     pack_plugins(plugins)
+elif command=='source':
+    pack_sources(plugins)
 
     
 




From MAILER-DAEMON Tue Mar 03 08:21:21 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LeUYj-0005HG-P6
	for mharc-myserver-commit@gnu.org; Tue, 03 Mar 2009 08:21:21 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LeUYi-0005GU-3F
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:21:20 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LeUYg-0005GI-CY
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:21:18 -0500
Received: from [199.232.76.173] (port=53574 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LeUYg-0005GF-54
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:21:18 -0500
Received: from savannah.gnu.org ([199.232.41.3]:52569 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <dperrone@it.gnu.org>) id 1LeUYf-0004qv-PM
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 08:21:17 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <dperrone@it.gnu.org>) id 1LeUYe-0007aX-At
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 13:21:16 +0000
Received: from dperrone by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <dperrone@savannah.gnu.org>) id 1LeUYc-0007a2-Sd
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 13:21:15 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: dperrone
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Daniele Perrone <dperrone@it.gnu.org>
Message-Id: <E1LeUYc-0007a2-Sd@cvs.savannah.gnu.org>
Date: Tue, 03 Mar 2009 13:21:15 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3021] myserver-get: 
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Mar 2009 13:21:20 -0000

Revision: 3021
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3021
Author:   dperrone
Date:     2009-03-03 13:21:12 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
myserver-get: 
- refactoring install command code
- added source command
- added source-auto command (compile sources after download them)

Modified Paths:
--------------
    trunk/misc/myserver-get/myserver-get.py
    trunk/misc/myserver-get/myserverGetLib/config.py
    trunk/misc/myserver-get/myserverGetLib/general.py
    trunk/misc/myserver-get/myserverGetLib/local.py
    trunk/misc/myserver-get/myserverGetLib/remote.py
    trunk/misc/myserver-get/myserverGetLib/remoteGenericUrl.py

Modified: trunk/misc/myserver-get/myserver-get.py
===================================================================
--- trunk/misc/myserver-get/myserver-get.py	2009-03-03 13:01:10 UTC (rev 3020)
+++ trunk/misc/myserver-get/myserver-get.py	2009-03-03 13:21:12 UTC (rev 3021)
@@ -5,13 +5,13 @@
 
 
 def usage(arg):
-    print "usage: myserver-get update "    
+    print "usage: myserver-get [update|search|install|source|source-auto] [-v|--verbose|-h|--help] "    
         
 def main(argv):
     myserverGet = MyServerGet() 
     command = ""                        
     
-    commands = {"":usage, "update":myserverGet.update, "search":myserverGet.search,"install":myserverGet.install}
+    commands = {"":usage, "update":myserverGet.update, "search":myserverGet.search,"install":myserverGet.install,"source":myserverGet.source,"source-auto":myserverGet.sourceAuto}
     
 
     import os
@@ -39,7 +39,7 @@
     
     arguments = []
     for arg in args:
-        if arg in ("update","search","install"):
+        if arg in ("update","search","install","source","source-auto"):
             command = arg
         else:
             arguments.append(arg)

Modified: trunk/misc/myserver-get/myserverGetLib/config.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/config.py	2009-03-03 13:01:10 UTC (rev 3020)
+++ trunk/misc/myserver-get/myserverGetLib/config.py	2009-03-03 13:21:12 UTC (rev 3021)
@@ -13,10 +13,9 @@
 
 MYSERVER_VERSION = "0.9"
 
+MSHEADERS = "/home/dany/srcprojects/myserver/myserver"
+
 verbose = False
 
 arch = ""
 
-class ConfigLoader:
-    def __init__(self, configFile):
-        self.__configFile = configFile
\ No newline at end of file

Modified: trunk/misc/myserver-get/myserverGetLib/general.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/general.py	2009-03-03 13:01:10 UTC (rev 3020)
+++ trunk/misc/myserver-get/myserverGetLib/general.py	2009-03-03 13:21:12 UTC (rev 3021)
@@ -17,6 +17,7 @@
         self.__repManager.addSupportedRepository("http",remoteGenericUrl.RepositoryGenericUrl)
         self.__repManager.addSupportedRepository("ftp",remoteGenericUrl.RepositoryGenericUrl)
         self.__list = []
+        self.__dbManager = local.DatabaseManager()
         self.loadRepositoryList()
         self.__versionRegex = re.compile(r'^([1-2]?[1-9]?[0-9])?(.[1-2]?[0-9]?[0-9])?(.[1-2]?[0-9]?[0-9])?(.[1-2]?[0-9]?[0-9])?$')
         
@@ -28,11 +29,13 @@
             result = numbers[i] << 8*(4-i)
         return result
         
+        
     def loadRepositoryList(self):
         list = xml.dom.minidom.parse(self.__rep)
         repXmlList = list.getElementsByTagName("REPOSITORY")
         self.__list = [local.ListManager(repXml.firstChild.data,self.__listDir) for repXml in repXmlList]
         
+        
     def update(self, arg):
         for list in self.__list:
             rep = self.__repManager.getRepository(list.repository)
@@ -49,6 +52,7 @@
                     results.append(plugin)
         return results
         
+        
     def search(self,arg):
         arg = " ".join(arg)     
         if config.verbose:
@@ -57,6 +61,7 @@
             results = [plugin["name"][0]["value"] + " - " + plugin["description"][0]["value"] for plugin in self.__search(arg)]
         console.writeln("\n".join(results))
     
+    
     def __find(self,arg):
         for list in self.__list:
             plugins = list.getPluginsList()
@@ -65,6 +70,7 @@
                     return (plugin,list)
         return [None, None]
     
+    
     def __recursiveDependencesChecker(self,pluginRoot):
         result = []
         errors = []
@@ -85,6 +91,7 @@
             errors.extend(er)
         return (result,errors)    
     
+    
     def install(self,args):
         for arg in args:
             (plugin,list) = self.__find(arg)
@@ -107,6 +114,7 @@
                     console.writeln("Error while install %s: %s" % (plugin["name"][0]["value"],msg))
                 return None
             toInstall.extend(result)
+
             
             console.write ("the following plugins will be installed:\n %s\n do you want to continue?[Y|n] " % (", ".join(plugin["name"][0]["value"] for (plugin,list) in toInstall)))
             resp = string.lower(console.readln())
@@ -120,6 +128,9 @@
             
             downloadErrors = []
             for (plugin,list) in toInstall:
+                if self.__dbManager.isPluginInstalled(plugin):
+                    console.writeln ("plugin %s already installed." % (plugin["name"][0]["value"]))
+                    continue
                 rep = self.__repManager.getRepository(list.repository)
                 rep = rep(list.repository)
                 if not rep.getPluginBinary(list,plugin):
@@ -130,6 +141,9 @@
                 return None
                 
             for (plugin,list) in toInstall:
+                if self.__dbManager.isPluginInstalled(plugin):
+                    continue
+                
                 filename = config.MYSERVER_PLUGIN_DIR + "/%s-%s-%s.tar.gz" % (plugin["name"][0]["value"],plugin["version"][0]["value"],config.arch)
                 import tarfile
                 console.writeln("Exctracting plugin package..")
@@ -141,4 +155,58 @@
                     return None
                 import os
                 os.remove(filename)
-                console.writeln("plugin %s installed." % (plugin["name"][0]["value"]))
\ No newline at end of file
+                console.writeln("plugin %s installed.\n" % (plugin["name"][0]["value"]))
+    
+    def source(self,args):
+        for arg in args:
+            (plugin,list) = self.__find(arg)
+            if plugin == None:
+                console.writeln("No plugin with this name is present in the plugin database.")
+                return None
+            import tempfile
+            dir = "./"
+            rep = self.__repManager.getRepository(list.repository)
+            rep = rep(list.repository)
+            if not rep.getPluginSource(list,plugin,dir):
+                console.writeln ("Errors retriving the source package: %s-%s-src.tar.gz" % (plugin["name"][0]["value"],plugin["version"][0]["value"]))
+                return None
+            
+            filename = dir + "/%s-%s-src.tar.gz" % (plugin["name"][0]["value"],plugin["version"][0]["value"])
+                    
+                
+            import tarfile
+            console.writeln("Exctracting source package..")
+            try:
+                tarf = tarfile.open(filename.encode("ascii"),"r|gz")
+                tarf.extractall (dir)
+            except Exception:
+                console.writeln("Error while exctracting source package!")
+                return None
+            
+            console.writeln("%s source installed." % (plugin["name"][0]["value"]))
+            
+    def sourceAuto(self,args):
+         self.source(args)
+         import os
+         rootpath = os.path.abspath("./")
+         for arg in args:
+             import subprocess
+             
+             path = os.path.join(rootpath,arg)
+             os.chdir(path)
+             try:
+                 os.mkdir("bin")
+             except Exception:
+                 pass
+             print os.path.abspath("./")
+             retcode = subprocess.call(["scons", "plugin="+arg,"command=build", "msheaders="+ config.MSHEADERS])
+             if retcode==0:
+                 import shutil
+                 os.chdir(rootpath)
+                 shutil.copytree(os.path.join(arg,"bin",arg),os.path.join(config.MYSERVER_PLUGIN_DIR,arg))
+                 console.writeln("\n plugin %s installed." % (arg))
+                 console.writeln("WARNING! no dependeces checked!")
+                 continue
+                 
+             console.writeln("Error while compiling the source package. check scons error message.")
+             
\ No newline at end of file

Modified: trunk/misc/myserver-get/myserverGetLib/local.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/local.py	2009-03-03 13:01:10 UTC (rev 3020)
+++ trunk/misc/myserver-get/myserverGetLib/local.py	2009-03-03 13:21:12 UTC (rev 3021)
@@ -56,6 +56,7 @@
     def finalize(self):
         self.__manager.synchronizeListWithFileSystem()
 
+
 class ListManager:   
     def __init__ (self,repository, listFilePath, listFile = None):
         self.repository = repository
@@ -140,8 +141,18 @@
         pluginsList = self.listDOM.getElementsByTagName("PLUGINS")
         plugins = pluginsList[0]
         return plugins.getAttribute("revision")
-           
 
+class DatabaseManager:
+    def __init__ (self,path = config.MYSERVER_PLUGIN_DIR):
+        import os
+        self.pluginsDir = path
+        self.plugins = [f for f in os.listdir(self.pluginsDir) if not os.path.isfile(os.path.join(self.pluginsDir, f))]
+        
+    def isPluginInstalled(self,plugin):
+        return plugin["name"][0]["value"] in self.plugins   
+    
+            
+
 if __name__ == "__main__":
     manager = ListManager("localhost.it",".","localhost.it-plugins.list")
     plugin = manager.getPlugin("prova")

Modified: trunk/misc/myserver-get/myserverGetLib/remote.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/remote.py	2009-03-03 13:01:10 UTC (rev 3020)
+++ trunk/misc/myserver-get/myserverGetLib/remote.py	2009-03-03 13:21:12 UTC (rev 3021)
@@ -11,6 +11,9 @@
     def getPluginBinary(self,list,plugin):
         pass
     
+    def getPluginSource(self,list,source,dir):
+        pass
+    
 class RepositoryManager:
     def __init__(self):
         self.__reps = {}

Modified: trunk/misc/myserver-get/myserverGetLib/remoteGenericUrl.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/remoteGenericUrl.py	2009-03-03 13:01:10 UTC (rev 3020)
+++ trunk/misc/myserver-get/myserverGetLib/remoteGenericUrl.py	2009-03-03 13:21:12 UTC (rev 3021)
@@ -17,6 +17,7 @@
         
     
     def synchronizeListWithRepository(self, list):
+        Repository.synchronizeListWithRepository(self,list)
         console.write("update: "+ list.repository + '\n')
         console.write("loading ")
         localRevision = int(list.getRevision())
@@ -47,14 +48,26 @@
             list.synchronizeListWithFileSystem()
             console.write("DONE.\n")
     
-    def getPluginBinary(self,list,plugin):
-        url ="%s/pub/%s-%s-%s.tar.gz" % (list.repository,plugin["name"][0]["value"],plugin["version"][0]["value"],config.arch)
-        filename = config.MYSERVER_PLUGIN_DIR + "/%s-%s-%s.tar.gz" % (plugin["name"][0]["value"],plugin["version"][0]["value"],config.arch)
-        console.writeln("Downloading %s-%s-%s.tar.gz..." % (plugin["name"][0]["value"],plugin["version"][0]["value"],config.arch))
+    def __getRemoteFile(self, url,filename):
+        import os
+        (filepath, file) = os.path.split(filename)
+        console.writeln("Downloading %s..\n" % (file))
         try:
             urllib.urlretrieve(url, filename)
         except Exception:
             console.writeln("Error while retriving remote file!")
             return False
         return True
+    
+    def getPluginBinary(self,list,plugin):
+        Repository.getPluginBinary(self,list,plugin)
+        url ="%s/pub/%s-%s-%s.tar.gz" % (list.repository,plugin["name"][0]["value"],plugin["version"][0]["value"],config.arch)
+        filename = config.MYSERVER_PLUGIN_DIR + "/%s-%s-%s.tar.gz" % (plugin["name"][0]["value"],plugin["version"][0]["value"],config.arch)
+        return self.__getRemoteFile(url, filename)
+    
+    def getPluginSource(self,list,plugin, dir):
+        Repository.getPluginSource(self,list,plugin,dir)
+        url ="%s/src/%s-%s-src.tar.gz" % (list.repository,plugin["name"][0]["value"],plugin["version"][0]["value"])
+        filename = dir + "/%s-%s-src.tar.gz" % (plugin["name"][0]["value"],plugin["version"][0]["value"])
+        return self.__getRemoteFile(url, filename)
         
\ No newline at end of file




From MAILER-DAEMON Tue Mar 03 11:06:19 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LeX8N-00063p-Rq
	for mharc-myserver-commit@gnu.org; Tue, 03 Mar 2009 11:06:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LeX8M-00063X-AK
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 11:06:18 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LeX8L-00063E-7P
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 11:06:17 -0500
Received: from [199.232.76.173] (port=52141 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LeX8K-00063B-SL
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 11:06:16 -0500
Received: from savannah.gnu.org ([199.232.41.3]:32821 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <dperrone@it.gnu.org>) id 1LeX8K-0005Ii-BM
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 11:06:16 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <dperrone@it.gnu.org>) id 1LeX8J-0004Gl-SF
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 16:06:15 +0000
Received: from dperrone by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <dperrone@savannah.gnu.org>) id 1LeX8J-0004Gh-Ih
	for myserver-commit@gnu.org; Tue, 03 Mar 2009 16:06:15 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: dperrone
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Daniele Perrone <dperrone@it.gnu.org>
Message-Id: <E1LeX8J-0004Gh-Ih@cvs.savannah.gnu.org>
Date: Tue, 03 Mar 2009 16:06:15 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3022] myserver-get:
 added remove command + removed svn protocol partial support.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Mar 2009 16:06:18 -0000

Revision: 3022
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3022
Author:   dperrone
Date:     2009-03-03 16:06:15 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
myserver-get: added remove command + removed svn protocol partial support.

Modified Paths:
--------------
    trunk/misc/myserver-get/myserver-get.py
    trunk/misc/myserver-get/myserverGetLib/general.py
    trunk/misc/myserver-get/myserverGetLib/local.py

Removed Paths:
-------------
    trunk/misc/myserver-get/myserverGetLib/remoteSvn.py

Modified: trunk/misc/myserver-get/myserver-get.py
===================================================================
--- trunk/misc/myserver-get/myserver-get.py	2009-03-03 13:21:12 UTC (rev 3021)
+++ trunk/misc/myserver-get/myserver-get.py	2009-03-03 16:06:15 UTC (rev 3022)
@@ -5,13 +5,13 @@
 
 
 def usage(arg):
-    print "usage: myserver-get [update|search|install|source|source-auto] [-v|--verbose|-h|--help] "    
+    print "usage: myserver-get [update|search|install|source|source-auto|remove] [-v|--verbose|-h|--help] "    
         
 def main(argv):
     myserverGet = MyServerGet() 
     command = ""                        
     
-    commands = {"":usage, "update":myserverGet.update, "search":myserverGet.search,"install":myserverGet.install,"source":myserverGet.source,"source-auto":myserverGet.sourceAuto}
+    commands = {"":usage, "update":myserverGet.update, "search":myserverGet.search,"install":myserverGet.install,"source":myserverGet.source,"source-auto":myserverGet.sourceAuto,"remove":myserverGet.remove}
     
 
     import os
@@ -39,7 +39,7 @@
     
     arguments = []
     for arg in args:
-        if arg in ("update","search","install","source","source-auto"):
+        if arg in ("update","search","install","source","source-auto","remove"):
             command = arg
         else:
             arguments.append(arg)

Modified: trunk/misc/myserver-get/myserverGetLib/general.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/general.py	2009-03-03 13:21:12 UTC (rev 3021)
+++ trunk/misc/myserver-get/myserverGetLib/general.py	2009-03-03 16:06:15 UTC (rev 3022)
@@ -13,7 +13,6 @@
         self.__rep = repositoryFile
         self.__listDir = listDir
         self.__repManager = remote.RepositoryManager()
-        self.__repManager.addSupportedRepository("svn",remoteSvn.RepositorySvn)
         self.__repManager.addSupportedRepository("http",remoteGenericUrl.RepositoryGenericUrl)
         self.__repManager.addSupportedRepository("ftp",remoteGenericUrl.RepositoryGenericUrl)
         self.__list = []
@@ -128,7 +127,7 @@
             
             downloadErrors = []
             for (plugin,list) in toInstall:
-                if self.__dbManager.isPluginInstalled(plugin):
+                if self.__dbManager.isPluginInstalled(plugin["name"][0]["value"]):
                     console.writeln ("plugin %s already installed." % (plugin["name"][0]["value"]))
                     continue
                 rep = self.__repManager.getRepository(list.repository)
@@ -141,7 +140,7 @@
                 return None
                 
             for (plugin,list) in toInstall:
-                if self.__dbManager.isPluginInstalled(plugin):
+                if self.__dbManager.isPluginInstalled(plugin["name"][0]["value"]):
                     continue
                 
                 filename = config.MYSERVER_PLUGIN_DIR + "/%s-%s-%s.tar.gz" % (plugin["name"][0]["value"],plugin["version"][0]["value"],config.arch)
@@ -209,4 +208,24 @@
                  continue
                  
              console.writeln("Error while compiling the source package. check scons error message.")
-             
\ No newline at end of file
+    
+    def remove(self,args):
+        console.write ("the following plugins will be removed:\n %s\n do you want to continue?[Y|n] " % (", ".join(args)))
+        resp = string.lower(console.readln())
+            
+        while not resp in  ("y\n","n\n","\n"):
+            console.write ("the following plugins will be removed:\n %s\n do you want to continue?[Y|n] " % (", ".join(args)))
+            resp = string.lower(console.readln())
+        if resp == 'n\n':
+            console.writeln ("Install aborted.")
+            return None
+        
+        console.writeln ("")
+        
+        for arg in args:
+            if not self.__dbManager.isPluginInstalled(arg):
+                console.writeln("Plugin %s already not installed.\n" % (arg))
+            elif self.__dbManager.removePlugin(arg):
+                console.writeln("Plugin %s removed.\n" % (arg))
+            else:
+                console.writeln("Error while removing plugin %s.\n" % (arg))            
\ No newline at end of file

Modified: trunk/misc/myserver-get/myserverGetLib/local.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/local.py	2009-03-03 13:21:12 UTC (rev 3021)
+++ trunk/misc/myserver-get/myserverGetLib/local.py	2009-03-03 16:06:15 UTC (rev 3022)
@@ -149,9 +149,19 @@
         self.plugins = [f for f in os.listdir(self.pluginsDir) if not os.path.isfile(os.path.join(self.pluginsDir, f))]
         
     def isPluginInstalled(self,plugin):
-        return plugin["name"][0]["value"] in self.plugins   
+        return plugin in self.plugins   
     
-            
+    
+    def removePlugin(self,plugin):
+        import shutil
+        import os
+        pluginPath = os.path.join(self.pluginsDir,plugin)
+        try:
+            shutil.rmtree(pluginPath)
+        except Exception:
+            return False
+        return True
+                
 
 if __name__ == "__main__":
     manager = ListManager("localhost.it",".","localhost.it-plugins.list")

Deleted: trunk/misc/myserver-get/myserverGetLib/remoteSvn.py
===================================================================
--- trunk/misc/myserver-get/myserverGetLib/remoteSvn.py	2009-03-03 13:21:12 UTC (rev 3021)
+++ trunk/misc/myserver-get/myserverGetLib/remoteSvn.py	2009-03-03 16:06:15 UTC (rev 3022)
@@ -1,43 +0,0 @@
-import pysvn
-import local
-import error
-import xml.dom.minidom
-from remote import Repository
-import console
-
-class RepositorySvn(Repository):
-    def __init__ (self,url):
-        Repository.__init__(self,url)
-        self.client = pysvn.Client()
-    
-    def __getPluginsList(self):
-        plugins = self.client.list(self.url + "/src",recurse=False)
-        import string
-        plugins = [string.split(elem[0]["repos_path"],"/")[-1] for elem in plugins]
-        return plugins[1:]
-    
-    def synchronizeListWithRepository(self, list):
-        console.write("update: "+ list.repository + '\n')
-        console.write("loading ")
-        localRevision = int(list.getRevision())
-        info = self.client.info2(self.url, recurse=False)
-        console.write(". ")
-        remoteRevision = int(info[0][1]["rev"].number)
-        if localRevision == remoteRevision:
-            console.write("local list already updated.\n")
-        if localRevision > remoteRevision:
-            raise error.FatalError("Local plugins list corrupted!!")
-        
-        if localRevision < remoteRevision:
-            list.resetToEmptyListFile(`remoteRevision`)
-            console.write(". ")
-            plugins = self.__getPluginsList()
-            console.write(". ")
-            for plugin in plugins:
-                url = self.url + "/src/" + plugin + "/plugin.xml"
-                pluginXml =  xml.dom.minidom.parseString(self.client.cat(url))
-                console.write(". ")
-                element = pluginXml.getElementsByTagName("PLUGIN")
-                pluginInfo = list.addPluginWithXml(element[0])
-            list.synchronizeListWithFileSystem()
-            console.write("DONE.\n")




From MAILER-DAEMON Sun Mar 08 04:58:53 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LgEqT-0005j3-8B
	for mharc-myserver-commit@gnu.org; Sun, 08 Mar 2009 04:58:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LgEqR-0005ic-9Z
	for myserver-commit@gnu.org; Sun, 08 Mar 2009 04:58:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LgEqP-0005iM-ND
	for myserver-commit@gnu.org; Sun, 08 Mar 2009 04:58:50 -0400
Received: from [199.232.76.173] (port=40909 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LgEqP-0005iG-GR
	for myserver-commit@gnu.org; Sun, 08 Mar 2009 04:58:49 -0400
Received: from savannah.gnu.org ([199.232.41.3]:48487 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LgEqP-0006lD-3f
	for myserver-commit@gnu.org; Sun, 08 Mar 2009 04:58:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LgEqO-0007AG-BG
	for myserver-commit@gnu.org; Sun, 08 Mar 2009 08:58:48 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LgEqN-0007A8-Sr
	for myserver-commit@gnu.org; Sun, 08 Mar 2009 08:58:48 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LgEqN-0007A8-Sr@cvs.savannah.gnu.org>
Date: Sun, 08 Mar 2009 08:58:47 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3023] Added endianness test for big-endian
	architectures.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Mar 2009 08:58:51 -0000

Revision: 3023
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3023
Author:   gscrivano
Date:     2009-03-08 08:58:47 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
Added endianness test for big-endian architectures.

Modified Paths:
--------------
    trunk/myserver/configure.in

Modified: trunk/myserver/configure.in
===================================================================
--- trunk/myserver/configure.in	2009-03-03 16:06:15 UTC (rev 3022)
+++ trunk/myserver/configure.in	2009-03-08 08:58:47 UTC (rev 3023)
@@ -46,6 +46,7 @@
 AC_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
+AC_C_BIGENDIAN
 
 AC_CHECK_PROG(make_info, makeinfo, yes, no)
 if test x$make_info = xno ; then




From MAILER-DAEMON Mon Mar 23 13:38:46 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Llo6o-00087q-MX
	for mharc-myserver-commit@gnu.org; Mon, 23 Mar 2009 13:38:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Llo6m-00086m-Ls
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:38:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Llo6m-00086M-4R
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:38:44 -0400
Received: from [199.232.76.173] (port=44748 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Llo6l-000868-Rz
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:38:43 -0400
Received: from savannah.gnu.org ([199.232.41.3]:38154 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1Llo6l-0001vp-Dr
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:38:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Llo6k-0008KZ-PD
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 17:38:42 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1Llo6k-0008KV-GX
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 17:38:42 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1Llo6k-0008KV-GX@cvs.savannah.gnu.org>
Date: Mon, 23 Mar 2009 17:38:42 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3024] Return non-zero if the file was not opened
	correctly.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2009 17:38:45 -0000

Revision: 3024
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3024
Author:   gscrivano
Date:     2009-03-23 17:38:42 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Return non-zero if the file was not opened correctly.  Patch provided by Ivailo Ilionov <ivailo.ilionov@gmail.com>.

Modified Paths:
--------------
    trunk/myserver/src/base/file/file.cpp

Modified: trunk/myserver/src/base/file/file.cpp
===================================================================
--- trunk/myserver/src/base/file/file.cpp	2009-03-08 08:58:47 UTC (rev 3023)
+++ trunk/myserver/src/base/file/file.cpp	2009-03-23 17:38:42 UTC (rev 3024)
@@ -112,8 +112,7 @@
 }
 
 /*!
- *Open (or create if not exists) a file.
- *If the function have success the return value is nonzero.
+ *Open (or create if not exists) a file, but must explicitly use read and/or write flags and open flag.
  *\param nfilename Filename to open.
  *\param opt Specify how open the file.
  *openFile returns 0 if the call was successful, any other value on errors.
@@ -265,6 +264,8 @@
   {
     handle = (FileHandle)0;
     filename.clear();
+    
+    return 1;
   }
 #endif
   




From MAILER-DAEMON Mon Mar 23 13:43:59 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LloBr-0005zJ-KY
	for mharc-myserver-commit@gnu.org; Mon, 23 Mar 2009 13:43:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LloBp-0005y3-HX
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:43:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LloBn-0005wM-PB
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:43:56 -0400
Received: from [199.232.76.173] (port=38725 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LloBn-0005vj-4G
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:43:55 -0400
Received: from savannah.gnu.org ([199.232.41.3]:51300 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LloBm-0002l4-QQ
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 13:43:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LloBm-0000R9-9n
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 17:43:54 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LloBm-0000R5-0z
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 17:43:54 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LloBm-0000R5-0z@cvs.savannah.gnu.org>
Date: Mon, 23 Mar 2009 17:43:54 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3025]
 Fixed a segfault when the server checks if a HTTP command is allowed in the
 current context .
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2009 17:43:57 -0000

Revision: 3025
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3025
Author:   gscrivano
Date:     2009-03-23 17:43:53 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Fixed a segfault when the server checks if a HTTP command is allowed in the current context.

Modified Paths:
--------------
    trunk/myserver/src/protocol/http/http.cpp

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp	2009-03-23 17:38:42 UTC (rev 3024)
+++ trunk/myserver/src/protocol/http/http.cpp	2009-03-23 17:43:53 UTC (rev 3025)
@@ -214,7 +214,7 @@
 bool Http::allowMethod(const char *method)
 {
   char name[64];
-  sprintf ("http.%s.allow", method);
+  sprintf (name, "http.%s.allow", method);
   const char *allow = td->securityToken.getHashedData (name, 
                                                        MYSERVER_VHOST_CONF |
                                                        MYSERVER_SERVER_CONF, "YES");




From MAILER-DAEMON Mon Mar 23 18:03:59 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LlsFT-0001ZV-3n
	for mharc-myserver-commit@gnu.org; Mon, 23 Mar 2009 18:03:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LlsFN-0001Vk-FT
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 18:03:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LlsFL-0001Ty-UU
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 18:03:52 -0400
Received: from [199.232.76.173] (port=33477 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LlsFL-0001To-Ox
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 18:03:51 -0400
Received: from savannah.gnu.org ([199.232.41.3]:39519 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LlsFL-0006TW-1F
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 18:03:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LlsFK-0008Jx-Jp
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 22:03:50 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LlsFK-0008Js-8i
	for myserver-commit@gnu.org; Mon, 23 Mar 2009 22:03:50 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LlsFK-0008Js-8i@cvs.savannah.gnu.org>
Date: Mon, 23 Mar 2009 22:03:50 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3026] Added documentation about temporary files
	location.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2009 22:03:56 -0000

Revision: 3026
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3026
Author:   gscrivano
Date:     2009-03-23 22:03:49 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Added documentation about temporary files location.

Modified Paths:
--------------
    trunk/myserver/documentation/basic_configuration.texi

Modified: trunk/myserver/documentation/basic_configuration.texi
===================================================================
--- trunk/myserver/documentation/basic_configuration.texi	2009-03-23 17:43:53 UTC (rev 3025)
+++ trunk/myserver/documentation/basic_configuration.texi	2009-03-23 22:03:49 UTC (rev 3026)
@@ -35,3 +35,28 @@
 the user (through the SERVER_ADMIN environment variable). 
 It is defined trought the @code{server.admin} variable, that can be
 set in the global configuration file or for virtual host.
+
+@section Temporary files position
+There can be need for the server to save temporary files as a form of
+inter-process communication.
+It is possible to configure the directory where temporary files are
+stored trought the @code{server.temp_directory} variable inside the
+main configuration file.
+Operations on disk are much slower than read or write directly from
+the primary memory.  To solve this problem under GNU/Linux you can
+think about use virtual memory instead of a persistent storage device
+to store files.
+
+It can be done, by the root user, as:
+
+@example
+# mount -t tmpfs -o size=256m tmpfs /tmp/tmpfs
+@end example
+
+The previous command mount a portion of memory, 256M, on the
+/tmp/tmpfs and it can be used as a normal file system.
+At this point, @code{server.temp_directory} shall be set to
+@file{/tmp/tmpfs} to benefit from it.
+Files saved on the primary memory are not persistent between reboots,
+introducing another level of security as temporary data will not be
+saved on the server.




From MAILER-DAEMON Tue Mar 24 18:41:47 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LmFJb-0003Sz-FA
	for mharc-myserver-commit@gnu.org; Tue, 24 Mar 2009 18:41:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LmFJZ-0003PO-ST
	for myserver-commit@gnu.org; Tue, 24 Mar 2009 18:41:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LmFJZ-0003OK-2b
	for myserver-commit@gnu.org; Tue, 24 Mar 2009 18:41:45 -0400
Received: from [199.232.76.173] (port=57856 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LmFJY-0003O1-UC
	for myserver-commit@gnu.org; Tue, 24 Mar 2009 18:41:44 -0400
Received: from savannah.gnu.org ([199.232.41.3]:55647 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LmFJY-0002KQ-Mw
	for myserver-commit@gnu.org; Tue, 24 Mar 2009 18:41:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LmFJX-0006m9-RD
	for myserver-commit@gnu.org; Tue, 24 Mar 2009 22:41:43 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LmFJX-0006m4-EW
	for myserver-commit@gnu.org; Tue, 24 Mar 2009 22:41:43 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LmFJX-0006m4-EW@cvs.savannah.gnu.org>
Date: Tue, 24 Mar 2009 22:41:43 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3027] Default virtual hosts use local
	directories.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Mar 2009 22:41:46 -0000

Revision: 3027
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3027
Author:   gscrivano
Date:     2009-03-24 22:41:42 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
Default virtual hosts use local directories.

Modified Paths:
--------------
    trunk/myserver/binaries/virtualhosts.default.xml

Modified: trunk/myserver/binaries/virtualhosts.default.xml
===================================================================
--- trunk/myserver/binaries/virtualhosts.default.xml	2009-03-23 22:03:49 UTC (rev 3026)
+++ trunk/myserver/binaries/virtualhosts.default.xml	2009-03-24 22:41:42 UTC (rev 3027)
@@ -3,20 +3,20 @@
 <VHOSTS>
 
 	<VHOST>
-		<NAME>Every connection</NAME>
+		<NAME>Every HTTP connection</NAME>
 		
 		<PORT>80</PORT>
 		<PROTOCOL>HTTP</PROTOCOL>
+		
+		<DOCROOT>web</DOCROOT>
+		<SYSFOLDER>system</SYSFOLDER>
 
-		<DOCROOT>/var/web/</DOCROOT>
-		<SYSFOLDER>/usr/local/share/myserver/system/</SYSFOLDER>
-
 		<ACCESSLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerHTTP.log" cycle="1048576"/>
+                  <STREAM location="file://logs/MyServerHTTP.log" cycle="1048576"/>
                 </ACCESSLOG>
 
                 <WARNINGLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerHTTP.err" cycle="1048576"/>
+                  <STREAM location="file://logs/MyServerHTTP.err" cycle="1048576"/>
                 </WARNINGLOG>
 	</VHOST>
 
@@ -25,16 +25,16 @@
 		
 		<PORT>21</PORT>
 		<PROTOCOL>FTP</PROTOCOL>
-
-		<DOCROOT>/var/web/</DOCROOT>
-		<SYSFOLDER>/usr/local/share/myserver/system/</SYSFOLDER>
-
+		
+		<DOCROOT>web</DOCROOT>
+		<SYSFOLDER>system</SYSFOLDER>
+		
 		<ACCESSLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerFTP.log" cycle="1048576"/>
+                  <STREAM location="file://logs/MyServerFTP.log" cycle="1048576"/>
                 </ACCESSLOG>
 
 		<WARNINGLOG>
-                  <STREAM location="file:///var/log/myserver/MyServerFTP.err" cycle="1048576"/>
+                  <STREAM location="file://logs/MyServerFTP.err" cycle="1048576"/>
                 </WARNINGLOG>
 	</VHOST>
 </VHOSTS>




From MAILER-DAEMON Thu Mar 26 17:52:34 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LmxV4-0007hO-0t
	for mharc-myserver-commit@gnu.org; Thu, 26 Mar 2009 17:52:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LmxV2-0007hA-Js
	for myserver-commit@gnu.org; Thu, 26 Mar 2009 17:52:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LmxV1-0007go-Un
	for myserver-commit@gnu.org; Thu, 26 Mar 2009 17:52:32 -0400
Received: from [199.232.76.173] (port=35007 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LmxV1-0007gf-Qm
	for myserver-commit@gnu.org; Thu, 26 Mar 2009 17:52:31 -0400
Received: from savannah.gnu.org ([199.232.41.3]:40075 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LmxV1-0000DW-El
	for myserver-commit@gnu.org; Thu, 26 Mar 2009 17:52:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LmxV0-0000Tw-RR
	for myserver-commit@gnu.org; Thu, 26 Mar 2009 21:52:30 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LmxUz-0000Tk-CM
	for myserver-commit@gnu.org; Thu, 26 Mar 2009 21:52:30 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LmxUz-0000Tk-CM@cvs.savannah.gnu.org>
Date: Thu, 26 Mar 2009 21:52:29 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3028] Return -1 on `Socket::bind ()' error.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Mar 2009 21:52:32 -0000

Revision: 3028
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3028
Author:   gscrivano
Date:     2009-03-26 21:52:28 +0000 (Thu, 26 Mar 2009)
Log Message:
-----------
Return -1 on `Socket::bind ()' error.  Patch provided by Ivaylo Ilionov.

Modified Paths:
--------------
    trunk/myserver/src/base/socket/socket.cpp

Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp	2009-03-24 22:41:42 UTC (rev 3027)
+++ trunk/myserver/src/base/socket/socket.cpp	2009-03-26 21:52:28 UTC (rev 3028)
@@ -160,14 +160,14 @@
 int Socket::bind(MYSERVER_SOCKADDR* sa,int namelen)
 {
    if ( sa == NULL || (sa->ss_family != AF_INET && sa->ss_family != AF_INET6) )
-      return 1;//Andu: TODO our error code or what?
+      return -1;
   if ( (sa->ss_family == AF_INET && namelen != sizeof(sockaddr_in)) 
 #if HAVE_IPV6
   || (sa->ss_family == AF_INET6 && namelen != sizeof(sockaddr_in6))
 #endif
  )
 
-     return 1;//Andu: TODO our error code or what?
+     return -1;
 #ifdef WIN32
   return ::bind((SOCKET)socketHandle,(const struct sockaddr*)sa,namelen);
 #endif




From MAILER-DAEMON Fri Mar 27 17:20:58 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnJU2-0004Zc-0h
	for mharc-myserver-commit@gnu.org; Fri, 27 Mar 2009 17:20:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnJTz-0004Y5-NI
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:20:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnJTy-0004XT-W1
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:20:55 -0400
Received: from [199.232.76.173] (port=52654 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnJTy-0004XG-Ng
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:20:54 -0400
Received: from savannah.gnu.org ([199.232.41.3]:40954 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LnJTy-0001jU-Ff
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:20:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LnJTw-0006j5-ED
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 21:20:53 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LnJTu-0006iT-DF
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 21:20:51 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LnJTu-0006iT-DF@cvs.savannah.gnu.org>
Date: Fri, 27 Mar 2009 21:20:50 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3029] Use `ioctlsocket' to set non blocking
	operations only under Windows.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Mar 2009 21:20:56 -0000

Revision: 3029
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3029
Author:   gscrivano
Date:     2009-03-27 21:20:48 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Use `ioctlsocket' to set non blocking operations only under Windows.

Modified Paths:
--------------
    trunk/myserver/src/base/socket/socket.cpp

Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp	2009-03-26 21:52:28 UTC (rev 3028)
+++ trunk/myserver/src/base/socket/socket.cpp	2009-03-27 21:20:48 UTC (rev 3029)
@@ -686,13 +686,12 @@
 int Socket::setNonBlocking(int non_blocking)
 {
   int ret = -1;
-#ifdef FIONBIO
+#ifdef WIN32
   u_long nonblock = non_blocking ? 1 : 0;
   ret = ioctlsocket( FIONBIO, &nonblock);
 
 #else
 
-#ifdef NOT_WIN
   int flags;
   flags = fcntl((int)socketHandle, F_GETFL, 0);
   if (flags < 0)
@@ -704,9 +703,9 @@
     flags &= ~O_NONBLOCK;
 
   ret = fcntl((int)socketHandle, F_SETFL, flags);
-#endif
 
 #endif
+
   return ret;
 }
 




From MAILER-DAEMON Fri Mar 27 17:21:03 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnJU7-0004cV-7D
	for mharc-myserver-commit@gnu.org; Fri, 27 Mar 2009 17:21:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnJU5-0004bR-8S
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:21:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnJU4-0004b2-QE
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:21:00 -0400
Received: from [199.232.76.173] (port=52659 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnJU4-0004ar-DL
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:21:00 -0400
Received: from savannah.gnu.org ([199.232.41.3]:40956 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LnJU4-0001ke-4J
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 17:21:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LnJU2-0006ji-Ao
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 21:20:58 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LnJU0-0006ja-Ui
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 21:20:57 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LnJU0-0006ja-Ui@cvs.savannah.gnu.org>
Date: Fri, 27 Mar 2009 21:20:56 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3030] Don't use blocking sockets in the
	connections scheduler.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Mar 2009 21:21:01 -0000

Revision: 3030
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3030
Author:   gscrivano
Date:     2009-03-27 21:20:55 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Don't use blocking sockets in the connections scheduler.

Modified Paths:
--------------
    trunk/myserver/src/connections_scheduler/connections_scheduler.cpp

Modified: trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
===================================================================
--- trunk/myserver/src/connections_scheduler/connections_scheduler.cpp	2009-03-27 21:20:48 UTC (rev 3029)
+++ trunk/myserver/src/connections_scheduler/connections_scheduler.cpp	2009-03-27 21:20:55 UTC (rev 3030)
@@ -180,7 +180,6 @@
   arg->scheduler = this;
   arg->server = server;
   arg->eventsMutex = &eventsMutex;
-  la->serverSocket->setNonBlocking(1);
 
   listeners.push_front(arg);
 
@@ -292,8 +291,6 @@
     return;
   }
 
-  dispatcherArg.socketPair.setNonBlocking (true);
-
   event_set (&(dispatcherArg.loopEvent), dispatcherArg.socketPair.getFirstHandle (), EV_READ | EV_TIMEOUT,
             eventLoopHandler, &dispatcherArg);
 




From MAILER-DAEMON Fri Mar 27 18:48:20 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnKqZ-0007xY-Ub
	for mharc-myserver-commit@gnu.org; Fri, 27 Mar 2009 18:48:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnKqY-0007xO-5u
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:48:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnKqX-0007x1-K6
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:48:17 -0400
Received: from [199.232.76.173] (port=47714 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnKqX-0007ww-E5
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:48:17 -0400
Received: from savannah.gnu.org ([199.232.41.3]:46299 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LnKqX-0002f3-51
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:48:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LnKqW-00028B-Fz
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 22:48:16 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LnKqW-000281-4w
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 22:48:16 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LnKqW-000281-4w@cvs.savannah.gnu.org>
Date: Fri, 27 Mar 2009 22:48:16 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3031] By default don't delete shared buffers.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Mar 2009 22:48:18 -0000

Revision: 3031
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3031
Author:   gscrivano
Date:     2009-03-27 22:48:15 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
By default don't delete shared buffers.

Modified Paths:
--------------
    trunk/myserver/src/base/mem_buff/mem_buff.cpp

Modified: trunk/myserver/src/base/mem_buff/mem_buff.cpp
===================================================================
--- trunk/myserver/src/base/mem_buff/mem_buff.cpp	2009-03-27 21:20:55 UTC (rev 3030)
+++ trunk/myserver/src/base/mem_buff/mem_buff.cpp	2009-03-27 22:48:15 UTC (rev 3031)
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2008, 2009 Free Software Foundation, Inc.
 Copyright (C) 2004, Guinet Adrien (grainailleur)
 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
@@ -133,7 +133,7 @@
   m_nRealSize = srcBuf.m_nRealSize;
   m_nSizeLimit = 0;
   m_nBlockLength = srcBuf.m_nBlockLength;
-  m_bCanDelete = 1;
+  m_bCanDelete = 0;
 }
 
 /*! Copy constructor */




From MAILER-DAEMON Fri Mar 27 18:49:21 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnKrZ-0008Jp-8l
	for mharc-myserver-commit@gnu.org; Fri, 27 Mar 2009 18:49:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnKrX-0008Jj-NI
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:49:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnKrW-0008JT-FF
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:49:18 -0400
Received: from [199.232.76.173] (port=47726 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnKrW-0008JQ-CD
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:49:18 -0400
Received: from savannah.gnu.org ([199.232.41.3]:46325 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LnKrW-0002jf-41
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 18:49:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LnKrV-0002Dy-Kj
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 22:49:17 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LnKrV-0002Du-Ea
	for myserver-commit@gnu.org; Fri, 27 Mar 2009 22:49:17 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LnKrV-0002Du-Ea@cvs.savannah.gnu.org>
Date: Fri, 27 Mar 2009 22:49:17 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3032] Use the found YACC and LEX programs to
	generate the FTP parser.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Mar 2009 22:49:20 -0000

Revision: 3032
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3032
Author:   gscrivano
Date:     2009-03-27 22:49:17 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Use the found YACC and LEX programs to generate the FTP parser.

Modified Paths:
--------------
    trunk/myserver/src/protocol/ftp/Makefile.am

Modified: trunk/myserver/src/protocol/ftp/Makefile.am
===================================================================
--- trunk/myserver/src/protocol/ftp/Makefile.am	2009-03-27 22:48:15 UTC (rev 3031)
+++ trunk/myserver/src/protocol/ftp/Makefile.am	2009-03-27 22:49:17 UTC (rev 3032)
@@ -4,7 +4,7 @@
 INCLUDES = $(all_includes)
 
 build_parser: ftp_lexer.lpp ftp_parser.ypp
-	bison --defines=../../../include/protocol/ftp/ftp_parser.h \
+	$(YACC) $(YFLAGS) --defines=../../../include/protocol/ftp/ftp_parser.h \
 	--output=ftp_parser.cpp ftp_parser.ypp
-	flex --header-file=../../../include/protocol/ftp/ftp_lexer.h \
+	$(LEX) --header-file=../../../include/protocol/ftp/ftp_lexer.h \
 	--outfile=ftp_lexer.cpp ftp_lexer.lpp




From MAILER-DAEMON Sat Mar 28 08:40:42 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnXq6-0000Qa-8w
	for mharc-myserver-commit@gnu.org; Sat, 28 Mar 2009 08:40:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnXq3-0000Nh-Ec
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:40:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnXq2-0000MD-A6
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:40:38 -0400
Received: from [199.232.76.173] (port=37516 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnXq2-0000Lr-3A
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:40:38 -0400
Received: from savannah.gnu.org ([199.232.41.3]:57379 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <alexandru.iancu@gmail.com>)
	id 1LnXq1-0005mY-NJ
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:40:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alexandru.iancu@gmail.com>) id 1LnXq0-0001zc-WE
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 12:40:37 +0000
Received: from andu by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <andu@savannah.gnu.org>) id 1LnXpz-0001yy-0H
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 12:40:36 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: andu
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alexandru IANCU <alexandru.iancu@gmail.com>
Message-Id: <E1LnXpz-0001yy-0H@cvs.savannah.gnu.org>
Date: Sat, 28 Mar 2009 12:40:35 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3033] segfault caused by improper/malicious
 sequence of commands(e.g.PASS/
 LIST); affected commands: LIST, NLST, PASV
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Mar 2009 12:40:40 -0000

Revision: 3033
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3033
Author:   andu
Date:     2009-03-28 12:40:28 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
segfault caused by improper/malicious sequence of commands(e.g.PASS/LIST); affected commands: LIST, NLST, PASV

Modified Paths:
--------------
    trunk/myserver/include/protocol/ftp/ftp_common.h
    trunk/myserver/src/base/file/files_utility.cpp
    trunk/myserver/src/conf/mime/mime_manager.cpp
    trunk/myserver/src/conf/vhost/vhost_manager.cpp
    trunk/myserver/src/protocol/ftp/ftp.cpp
    trunk/myserver/src/protocol/http/http.cpp

Modified: trunk/myserver/include/protocol/ftp/ftp_common.h
===================================================================
--- trunk/myserver/include/protocol/ftp/ftp_common.h	2009-03-27 22:49:17 UTC (rev 3032)
+++ trunk/myserver/include/protocol/ftp/ftp_common.h	2009-03-28 12:40:28 UTC (rev 3033)
@@ -32,7 +32,7 @@
 
 void SetFtpHost(FtpHost &out, const FtpHost &in);
 void SetFtpHost(FtpHost &out, const char *szIn);
-void GetIpAddr(const FtpHost &host, char *pOut);
+void GetIpAddr(const FtpHost &host, char *pOut, const int &nBuffSize);
 int GetPortNo(const FtpHost &host);
 std::string GetPortNo(unsigned int nPort);
 std::string GetHost(const FtpHost &host);

Modified: trunk/myserver/src/base/file/files_utility.cpp
===================================================================
--- trunk/myserver/src/base/file/files_utility.cpp	2009-03-27 22:49:17 UTC (rev 3032)
+++ trunk/myserver/src/base/file/files_utility.cpp	2009-03-28 12:40:28 UTC (rev 3033)
@@ -269,6 +269,7 @@
 #ifdef NOT_WIN
   struct stat F_Stats;
   int ret = stat(filename, &F_Stats);
+  int nErr = errno;
   if(ret < 0)
     return 0;
 

Modified: trunk/myserver/src/conf/mime/mime_manager.cpp
===================================================================
--- trunk/myserver/src/conf/mime/mime_manager.cpp	2009-03-27 22:49:17 UTC (rev 3032)
+++ trunk/myserver/src/conf/mime/mime_manager.cpp	2009-03-28 12:40:28 UTC (rev 3033)
@@ -170,6 +170,12 @@
     if (!xmlStrcmp (attrs->name, (const xmlChar *)"param") && 
         attrs->children && attrs->children->content)
       rc->cgiManager.assign ((const char*)attrs->children->content);
+    /*
+    if (!xmlStrcmp (attrs->name, (const xmlChar *)"host") && 
+        attrs->children && attrs->children->content)
+      rc-> = xmlStrcmp (attrs->children->content, 
+                                    (const xmlChar *)"YES");
+*/
   }
 
 

Modified: trunk/myserver/src/conf/vhost/vhost_manager.cpp
===================================================================
--- trunk/myserver/src/conf/vhost/vhost_manager.cpp	2009-03-27 22:49:17 UTC (rev 3032)
+++ trunk/myserver/src/conf/vhost/vhost_manager.cpp	2009-03-28 12:40:28 UTC (rev 3033)
@@ -377,8 +377,8 @@
             }
           else if(!xmlStrcmp(lcur->name, (const xmlChar *)"LOCATION"))
             {
-              string loc (vh->getDocumentRoot ());
-              loc.append ("/");
+              string loc (vh->getDocumentRoot());
+              //loc.append ("/");
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
                 {
                   if(!xmlStrcmp (attrs->name, (const xmlChar *)"path"))

Modified: trunk/myserver/src/protocol/ftp/ftp.cpp
===================================================================
--- trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-27 22:49:17 UTC (rev 3032)
+++ trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-28 12:40:28 UTC (rev 3033)
@@ -66,13 +66,14 @@
   free(szLocalIn);
 }
 
-void GetIpAddr(const FtpHost &host, char *pOut)
+void GetIpAddr(const FtpHost &host, char *pOut, const int &nBuffSize)
 {
   if ( pOut == NULL )
     return;
   std::ostringstream sRet;
   sRet << host.h1 << '.' << host.h2 << '.' << host.h3 << '.' << host.h4;
-  strcpy(pOut, sRet.str().c_str());
+  memset(pOut, 0, nBuffSize);
+  strncpy(pOut, sRet.str().c_str(), nBuffSize-1);
 }
 
 int GetPortNo(const FtpHost &host)
@@ -145,6 +146,12 @@
   m_sCurrentFileName = "";
   m_nFileSize = 0;
   m_nBytesSent = 0;
+  m_cdh.h1 = 0;
+  m_cdh.h2 = 0;
+  m_cdh.h3 = 0;
+  m_cdh.h4 = 0;
+  m_cdh.p1 = 0;
+  m_cdh.p2 = 0;
 }
 
 int FtpUserData::CloseDataConnection()
@@ -544,7 +551,10 @@
 
   pFtpUserData->m_bPassiveSrv = true;
     if ( OpenDataConnection() == 0 )
-    ftp_reply(425);//RFC959 command replay exception
+      {
+	ftp_reply(425);//RFC959 command replay exception
+	return;
+      }
 
   std::string sTempText;
   get_ftp_reply(227, sTempText);
@@ -1573,7 +1583,7 @@
   ((sockaddr_in*)(&storage))->sin_family = AF_INET;
   char szIpAddr[16];
   memset(szIpAddr, 0, 16);
-  GetIpAddr(pFtpUserData->m_cdh, szIpAddr);
+  GetIpAddr(pFtpUserData->m_cdh, szIpAddr, 16);
 #ifdef WIN32
   ((sockaddr_in*)(&storage))->sin_addr.s_addr = inet_addr(szIpAddr);
 #else
@@ -1604,7 +1614,7 @@
   dataSocket.socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
   char szIpAddr[16];
   memset(szIpAddr, 0, 16);
-  GetIpAddr(pFtpUserData->m_cdh, szIpAddr);
+  GetIpAddr(pFtpUserData->m_cdh, szIpAddr, 16);
   if ( dataSocket.connect(szIpAddr, GetPortNo(pFtpUserData->m_cdh)) < 0 )
     return 0;
 
@@ -1691,7 +1701,10 @@
     {
       ftp_reply(150);
         if ( OpenDataConnection() == 0 )
-        ftp_reply(425);
+	  {
+	    ftp_reply(425);
+	    return;
+	  }
     }
 
   std::string sPath(sLocalPath);
@@ -1924,7 +1937,10 @@
     {
       ftp_reply(150);
         if ( OpenDataConnection() == 0 )
-        ftp_reply(425);
+	  {
+	    ftp_reply(425);
+	    return;
+	  }
     }
 
   std::string sPath(sLocalPath);

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp	2009-03-27 22:49:17 UTC (rev 3032)
+++ trunk/myserver/src/protocol/http/http.cpp	2009-03-28 12:40:28 UTC (rev 3033)
@@ -820,7 +820,7 @@
     if(ret != 200)
       return raiseHTTPError(ret);
 
-    if(!td->mime && FilesUtility::isDirectory(td->filenamePath.c_str()))
+    if(!td->mime && FilesUtility::isDirectory(td->filenamePath.c_str()) /*&& filename.empty()*/)
     {
       return processDefaultFile (uri, td->permissions, onlyHeader);
     }
@@ -844,7 +844,7 @@
       {
         return manager->send (td,
                               td->connection,
-                              td->filenamePath.c_str(),
+                              filename.c_str(), //td->filenamePath.c_str(),
                               cgiManager,
                               td->mime->selfExecuted,
                               onlyHeader);




From MAILER-DAEMON Sat Mar 28 08:54:38 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnY3a-0000JM-Kf
	for mharc-myserver-commit@gnu.org; Sat, 28 Mar 2009 08:54:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnY3Z-0000Iw-1G
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:54:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnY3Y-0000Ih-69
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:54:36 -0400
Received: from [199.232.76.173] (port=41353 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnY3Y-0000Ie-0e
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:54:36 -0400
Received: from savannah.gnu.org ([199.232.41.3]:35634 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <alexandru.iancu@gmail.com>)
	id 1LnY3X-00010D-Hc
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 08:54:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alexandru.iancu@gmail.com>) id 1LnY3W-0003mP-Q9
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 12:54:34 +0000
Received: from andu by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <andu@savannah.gnu.org>) id 1LnY3W-0003mL-E8
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 12:54:34 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: andu
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alexandru IANCU <alexandru.iancu@gmail.com>
Message-Id: <E1LnY3W-0003mL-E8@cvs.savannah.gnu.org>
Date: Sat, 28 Mar 2009 12:54:34 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3034] wrong merge with old sources(e.g.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Mar 2009 12:54:37 -0000

Revision: 3034
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3034
Author:   andu
Date:     2009-03-28 12:54:34 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
wrong merge with old sources(e.g. files_utility.cpp, mime_manager.cpp, vhost_manager.cpp, http.cpp) - reverting to previous version

Modified Paths:
--------------
    trunk/myserver/src/base/file/files_utility.cpp
    trunk/myserver/src/conf/mime/mime_manager.cpp
    trunk/myserver/src/conf/vhost/vhost_manager.cpp
    trunk/myserver/src/protocol/http/http.cpp

Modified: trunk/myserver/src/base/file/files_utility.cpp
===================================================================
--- trunk/myserver/src/base/file/files_utility.cpp	2009-03-28 12:40:28 UTC (rev 3033)
+++ trunk/myserver/src/base/file/files_utility.cpp	2009-03-28 12:54:34 UTC (rev 3034)
@@ -269,7 +269,6 @@
 #ifdef NOT_WIN
   struct stat F_Stats;
   int ret = stat(filename, &F_Stats);
-  int nErr = errno;
   if(ret < 0)
     return 0;
 

Modified: trunk/myserver/src/conf/mime/mime_manager.cpp
===================================================================
--- trunk/myserver/src/conf/mime/mime_manager.cpp	2009-03-28 12:40:28 UTC (rev 3033)
+++ trunk/myserver/src/conf/mime/mime_manager.cpp	2009-03-28 12:54:34 UTC (rev 3034)
@@ -170,12 +170,6 @@
     if (!xmlStrcmp (attrs->name, (const xmlChar *)"param") && 
         attrs->children && attrs->children->content)
       rc->cgiManager.assign ((const char*)attrs->children->content);
-    /*
-    if (!xmlStrcmp (attrs->name, (const xmlChar *)"host") && 
-        attrs->children && attrs->children->content)
-      rc-> = xmlStrcmp (attrs->children->content, 
-                                    (const xmlChar *)"YES");
-*/
   }
 
 

Modified: trunk/myserver/src/conf/vhost/vhost_manager.cpp
===================================================================
--- trunk/myserver/src/conf/vhost/vhost_manager.cpp	2009-03-28 12:40:28 UTC (rev 3033)
+++ trunk/myserver/src/conf/vhost/vhost_manager.cpp	2009-03-28 12:54:34 UTC (rev 3034)
@@ -378,7 +378,7 @@
           else if(!xmlStrcmp(lcur->name, (const xmlChar *)"LOCATION"))
             {
               string loc (vh->getDocumentRoot());
-              //loc.append ("/");
+              loc.append ("/");
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
                 {
                   if(!xmlStrcmp (attrs->name, (const xmlChar *)"path"))

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp	2009-03-28 12:40:28 UTC (rev 3033)
+++ trunk/myserver/src/protocol/http/http.cpp	2009-03-28 12:54:34 UTC (rev 3034)
@@ -820,7 +820,7 @@
     if(ret != 200)
       return raiseHTTPError(ret);
 
-    if(!td->mime && FilesUtility::isDirectory(td->filenamePath.c_str()) /*&& filename.empty()*/)
+    if(!td->mime && FilesUtility::isDirectory(td->filenamePath.c_str()))
     {
       return processDefaultFile (uri, td->permissions, onlyHeader);
     }
@@ -844,7 +844,7 @@
       {
         return manager->send (td,
                               td->connection,
-                              filename.c_str(), //td->filenamePath.c_str(),
+                              filename.c_str(),
                               cgiManager,
                               td->mime->selfExecuted,
                               onlyHeader);




From MAILER-DAEMON Sat Mar 28 09:43:01 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnYoP-0002Tr-2L
	for mharc-myserver-commit@gnu.org; Sat, 28 Mar 2009 09:43:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnYoO-0002TA-2C
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 09:43:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnYoN-0002Si-42
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 09:42:59 -0400
Received: from [199.232.76.173] (port=58529 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnYoM-0002SR-JN
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 09:42:59 -0400
Received: from savannah.gnu.org ([199.232.41.3]:46662 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LnYoM-0003oC-3n
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 09:42:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LnYoL-0001qy-JN
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 13:42:57 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LnYoL-0001qs-BJ
	for myserver-commit@gnu.org; Sat, 28 Mar 2009 13:42:57 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LnYoL-0001qs-BJ@cvs.savannah.gnu.org>
Date: Sat, 28 Mar 2009 13:42:57 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3035] Use the complete file path to a HTTP
	manager.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Mar 2009 13:43:00 -0000

Revision: 3035
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3035
Author:   gscrivano
Date:     2009-03-28 13:42:56 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
Use the complete file path to a HTTP manager.

Modified Paths:
--------------
    trunk/myserver/src/protocol/http/http.cpp

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp	2009-03-28 12:54:34 UTC (rev 3034)
+++ trunk/myserver/src/protocol/http/http.cpp	2009-03-28 13:42:56 UTC (rev 3035)
@@ -844,7 +844,7 @@
       {
         return manager->send (td,
                               td->connection,
-                              filename.c_str(),
+                              td->filenamePath.c_str(),
                               cgiManager,
                               td->mime->selfExecuted,
                               onlyHeader);




From MAILER-DAEMON Sun Mar 29 05:27:50 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnrIz-0007Rg-Rm
	for mharc-myserver-commit@gnu.org; Sun, 29 Mar 2009 05:27:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnrIw-0007Oh-UJ
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 05:27:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnrIw-0007Nc-CJ
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 05:27:46 -0400
Received: from [199.232.76.173] (port=54193 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnrIw-0007NS-1H
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 05:27:46 -0400
Received: from savannah.gnu.org ([199.232.41.3]:43765 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1LnrIv-0005Ee-Rk
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 05:27:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1LnrIv-00056b-0f
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 09:27:45 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1LnrIu-00056X-M6
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 09:27:44 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1LnrIu-00056X-M6@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 09:27:44 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3036] `Socket::write' returns -1 on errors as
	`Socket::read' already does.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2009 09:27:47 -0000

Revision: 3036
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3036
Author:   gscrivano
Date:     2009-03-29 09:27:44 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
`Socket::write' returns -1 on errors as `Socket::read' already does.  Patch provided by Ivaylo Ilionov.

Modified Paths:
--------------
    trunk/myserver/src/base/socket/socket.cpp

Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp	2009-03-28 13:42:56 UTC (rev 3035)
+++ trunk/myserver/src/base/socket/socket.cpp	2009-03-29 09:27:44 UTC (rev 3036)
@@ -780,7 +780,7 @@
 
 /*!
  *Inherited from Stream.
- *Return zero on success.
+ *Return zero on success, or -1 error. Also sets nbr to -1 if error.
  */
 int Socket::read(char* buffer, u_long len, u_long *nbr)
 {
@@ -794,16 +794,14 @@
 
 /*!
  *Inherited from Stream.
- *Return values are equals to send.
+ *Return zero on success, or -1 on error. Also sets nbw to -1 if error.
  */
 int Socket::write(const char* buffer, u_long len, u_long *nbw)
 {
-  int ret = send(buffer, len, 0);
+  *nbw = static_cast<u_long>(send(buffer, len, 0));
 
-  if(ret == -1)
+  if ( *nbw == static_cast<u_long>(-1) )
     return -1;
 
-  *nbw = static_cast<u_long>(ret);
-
   return 0;
 }




From MAILER-DAEMON Sun Mar 29 14:03:48 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LnzMK-0006Ic-3i
	for mharc-myserver-commit@gnu.org; Sun, 29 Mar 2009 14:03:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnzMI-0006IX-AR
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 14:03:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnzMH-0006IE-Q2
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 14:03:45 -0400
Received: from [199.232.76.173] (port=59645 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnzMH-0006IA-EP
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 14:03:45 -0400
Received: from savannah.gnu.org ([199.232.41.3]:58641 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <alexandru.iancu@gmail.com>)
	id 1LnzMG-0001W8-PE
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 14:03:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alexandru.iancu@gmail.com>) id 1LnzMG-0002rT-8A
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 18:03:44 +0000
Received: from andu by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <andu@savannah.gnu.org>) id 1LnzMF-0002rP-SL
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 18:03:44 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: andu
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alexandru IANCU <alexandru.iancu@gmail.com>
Message-Id: <E1LnzMF-0002rP-SL@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 18:03:43 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3037] allow ftp sockets to be nonblocking
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2009 18:03:46 -0000

Revision: 3037
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3037
Author:   andu
Date:     2009-03-29 18:03:43 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
allow ftp sockets to be nonblocking

Modified Paths:
--------------
    trunk/myserver/src/base/socket/socket.cpp
    trunk/myserver/src/server/clients_thread.cpp

Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp	2009-03-29 09:27:44 UTC (rev 3036)
+++ trunk/myserver/src/base/socket/socket.cpp	2009-03-29 18:03:43 UTC (rev 3037)
@@ -31,6 +31,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
+#include <errno.h>
 }
 
 #include <sstream>
@@ -654,6 +655,14 @@
 #endif
 #ifdef NOT_WIN
   err = ::recv((int)socketHandle, buffer, len, flags);
+  if ( err < 0 && errno == EAGAIN )
+    {// if temporarily unavailable ...
+      int flags = fcntl((int)socketHandle, F_GETFL, 0);
+      if ( (flags >= 0) && ((flags & O_NONBLOCK) != 0) )
+	{// ... and nonblocking it's allright
+	  return 0;
+	}
+    }
 
   if(err == 0)
     err = -1;

Modified: trunk/myserver/src/server/clients_thread.cpp
===================================================================
--- trunk/myserver/src/server/clients_thread.cpp	2009-03-29 09:27:44 UTC (rev 3036)
+++ trunk/myserver/src/server/clients_thread.cpp	2009-03-29 18:03:43 UTC (rev 3037)
@@ -315,12 +315,26 @@
   busy = 1;
   dataRead = c->connectionBuffer.getLength();
 
+  bool bSocketChanged = false;
+  if ( strcmp(c->host->getProtocolName(), "ftp") == 0 )
+    {
+      FileHandle sh = c->socket->getHandle();
+      int flags = fcntl((int)sh, F_GETFL, 0);
+      if ( (flags >= 0) && ((flags & O_NONBLOCK) == 0) )
+	{
+	  c->socket->setNonBlocking(1);
+	  bSocketChanged = true;
+	}
+    }
   err = c->socket->recv(&((char*)(buffer.getBuffer()))[dataRead],
                         MYSERVER_KB(8) - dataRead - 1, 0);
 
   if(err == -1 && !server->deleteConnection(c))
     return 0;
 
+  if ( bSocketChanged )
+       c->socket->setNonBlocking(0);
+
   buffer.setLength(dataRead + err);    
 
   c->setForceControl(0);




From MAILER-DAEMON Sun Mar 29 16:34:37 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Lo1iH-0002eG-Fd
	for mharc-myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lo1iF-0002dv-PZ
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lo1iF-0002dc-7N
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:35 -0400
Received: from [199.232.76.173] (port=52852 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lo1iF-0002dZ-1I
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:35 -0400
Received: from savannah.gnu.org ([199.232.41.3]:41133 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1Lo1iE-0001JV-N2
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Lo1iD-0001Ri-D9
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 20:34:33 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1Lo1iD-0001RD-3R
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 20:34:33 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1Lo1iD-0001RD-3R@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 20:34:33 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3038] Don't use blocking sockets for protocols
 that don' t wait for client data to begin the handshake.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2009 20:34:36 -0000

Revision: 3038
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3038
Author:   gscrivano
Date:     2009-03-29 20:34:32 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
Don't use blocking sockets for protocols that don't wait for client data to begin the handshake.

Modified Paths:
--------------
    trunk/myserver/src/server/clients_thread.cpp
    trunk/myserver/src/server/server.cpp

Modified: trunk/myserver/src/server/clients_thread.cpp
===================================================================
--- trunk/myserver/src/server/clients_thread.cpp	2009-03-29 18:03:43 UTC (rev 3037)
+++ trunk/myserver/src/server/clients_thread.cpp	2009-03-29 20:34:32 UTC (rev 3038)
@@ -315,26 +315,12 @@
   busy = 1;
   dataRead = c->connectionBuffer.getLength();
 
-  bool bSocketChanged = false;
-  if ( strcmp(c->host->getProtocolName(), "ftp") == 0 )
-    {
-      FileHandle sh = c->socket->getHandle();
-      int flags = fcntl((int)sh, F_GETFL, 0);
-      if ( (flags >= 0) && ((flags & O_NONBLOCK) == 0) )
-	{
-	  c->socket->setNonBlocking(1);
-	  bSocketChanged = true;
-	}
-    }
   err = c->socket->recv(&((char*)(buffer.getBuffer()))[dataRead],
                         MYSERVER_KB(8) - dataRead - 1, 0);
 
   if(err == -1 && !server->deleteConnection(c))
     return 0;
 
-  if ( bSocketChanged )
-       c->socket->setNonBlocking(0);
-
   buffer.setLength(dataRead + err);    
 
   c->setForceControl(0);

Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp	2009-03-29 18:03:43 UTC (rev 3037)
+++ trunk/myserver/src/server/server.cpp	2009-03-29 20:34:32 UTC (rev 3038)
@@ -1447,6 +1447,7 @@
   {
     newConnection->setScheduled(1);
     newConnection->setForceControl(1);
+    newConnection->socket->setNonBlocking (1);
     connectionsScheduler.addNewReadyConnection(newConnection);
   }
   else




From MAILER-DAEMON Sun Mar 29 16:34:41 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Lo1iL-0002fZ-OO
	for mharc-myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lo1iJ-0002ey-UB
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lo1iI-0002em-DI
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:38 -0400
Received: from [199.232.76.173] (port=52854 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lo1iI-0002ei-7l
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:38 -0400
Received: from savannah.gnu.org ([199.232.41.3]:41135 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gscrivano@gnu.org>) id 1Lo1iH-0001Jp-Nw
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 16:34:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Lo1iG-0001Rx-Sn
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 20:34:36 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1Lo1iG-0001Rt-MH
	for myserver-commit@gnu.org; Sun, 29 Mar 2009 20:34:36 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: gscrivano
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Giuseppe Scrivano <gscrivano@gnu.org>
Message-Id: <E1Lo1iG-0001Rt-MH@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 20:34:36 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3039] Under Windows `Socket::recv'
 keeps the same behaviour that it has under POSIX with non blocking sockets
 .
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2009 20:34:40 -0000

Revision: 3039
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3039
Author:   gscrivano
Date:     2009-03-29 20:34:36 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
Under Windows `Socket::recv' keeps the same behaviour that it has under POSIX with non blocking sockets.

Modified Paths:
--------------
    trunk/myserver/include/base/socket/socket.h
    trunk/myserver/src/base/socket/socket.cpp

Modified: trunk/myserver/include/base/socket/socket.h
===================================================================
--- trunk/myserver/include/base/socket/socket.h	2009-03-29 20:34:32 UTC (rev 3038)
+++ trunk/myserver/include/base/socket/socket.h	2009-03-29 20:34:36 UTC (rev 3039)
@@ -99,6 +99,7 @@
   int operator=(Socket);
   int getsockname(MYSERVER_SOCKADDR*,int*);
   int setNonBlocking(int);
+  bool getNonBLocking () {return isNonBlocking;}
   virtual int dataOnRead(int sec = 0, int usec = 500);
 
   u_long getThrottling();
@@ -121,6 +122,9 @@
   /*! Send throttling rate.  */
   u_long throttlingRate;
 
+  /*! Is the socket non blocking?  */
+  bool isNonBlocking;
+
   /*! Stop the sockets system.  */
   static bool denyBlockingOperations;
 

Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp	2009-03-29 20:34:32 UTC (rev 3038)
+++ trunk/myserver/src/base/socket/socket.cpp	2009-03-29 20:34:36 UTC (rev 3039)
@@ -92,6 +92,7 @@
   socketHandle = s.socketHandle;
   serverSocket = s.serverSocket;
   throttlingRate = s.throttlingRate;
+  isNonBlocking = s.isNonBlocking;
   return 0;
 }
 /*!
@@ -113,7 +114,8 @@
 Socket::Socket(FileHandle handle)
 {
   throttlingRate = 0;
-  setHandle(handle);
+  setHandle (handle);
+  isNonBlocking = false;
 }
 
 /*!
@@ -124,6 +126,7 @@
   socketHandle = socket->socketHandle;
   serverSocket = socket->serverSocket;
   throttlingRate = socket->throttlingRate;
+  isNonBlocking = socket->isNonBlocking;
 }
 
 /*!
@@ -647,7 +650,10 @@
     err = ::recv(socketHandle, buffer, len, flags);
   }while((err == SOCKET_ERROR) && (GetLastError() == WSAEWOULDBLOCK));
 
-  if(err == SOCKET_ERROR)
+  if ( err == SOCKET_ERROR && GetLastError() == WSAEWOULDBLOCK && isNonBlocking)
+    return 0;
+
+  if (err == SOCKET_ERROR)
     return -1;
   else
     return err;
@@ -655,15 +661,10 @@
 #endif
 #ifdef NOT_WIN
   err = ::recv((int)socketHandle, buffer, len, flags);
-  if ( err < 0 && errno == EAGAIN )
-    {// if temporarily unavailable ...
-      int flags = fcntl((int)socketHandle, F_GETFL, 0);
-      if ( (flags >= 0) && ((flags & O_NONBLOCK) != 0) )
-	{// ... and nonblocking it's allright
-	  return 0;
-	}
-    }
 
+  if ( err < 0 && errno == EAGAIN && isNonBlocking)
+    return 0;
+
   if(err == 0)
     err = -1;
 
@@ -690,13 +691,18 @@
 }
 
 /*!
- *Pass a nonzero value to set the socket to be nonblocking.
+ *Change the socket behaviour when an operation can't be completed
+ *immediately.
+ *If the socket is configured to be non blocking then it will return
+ *immediately the control to the caller function.
+ *A blocking socket will wait until the operation can be performed.
+ *\param nonBlocking Nonzero to configure the socket non blocking.
  */
-int Socket::setNonBlocking(int non_blocking)
+int Socket::setNonBlocking(int nonBlocking)
 {
   int ret = -1;
 #ifdef WIN32
-  u_long nonblock = non_blocking ? 1 : 0;
+  u_long nonblock = nonBlocking ? 1 : 0;
   ret = ioctlsocket( FIONBIO, &nonblock);
 
 #else
@@ -706,7 +712,7 @@
   if (flags < 0)
     return -1;
 
-  if(non_blocking)
+  if(nonBlocking)
     flags |= O_NONBLOCK;
   else
     flags &= ~O_NONBLOCK;
@@ -714,7 +720,7 @@
   ret = fcntl((int)socketHandle, F_SETFL, flags);
 
 #endif
-
+  isNonBlocking = nonBlocking ? true : false;
   return ret;
 }
 




From MAILER-DAEMON Mon Mar 30 15:04:21 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LoMmS-0001je-RM
	for mharc-myserver-commit@gnu.org; Mon, 30 Mar 2009 15:04:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LoMmQ-0001hX-RN
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:04:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LoMmP-0001eW-B5
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:04:17 -0400
Received: from [199.232.76.173] (port=56812 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LoMmP-0001e6-3J
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:04:17 -0400
Received: from savannah.gnu.org ([199.232.41.3]:53055 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <alexandru.iancu@gmail.com>)
	id 1LoMmN-0003OC-GT
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:04:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alexandru.iancu@gmail.com>) id 1LoMmL-0008Ip-Rn
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 19:04:13 +0000
Received: from andu by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <andu@savannah.gnu.org>) id 1LoMmL-0008Il-KO
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 19:04:13 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: andu
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alexandru IANCU <alexandru.iancu@gmail.com>
Message-Id: <E1LoMmL-0008Il-KO@cvs.savannah.gnu.org>
Date: Mon, 30 Mar 2009 19:04:13 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3040] avoid double nulls at the end of strings(
 causing incorrect strings handling: e.g.
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2009 19:04:19 -0000

Revision: 3040
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3040
Author:   andu
Date:     2009-03-30 19:04:13 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
avoid double nulls at the end of strings(causing incorrect strings handling: e.g. append will do nothing)

Modified Paths:
--------------
    trunk/myserver/src/base/find_data/find_data.cpp

Modified: trunk/myserver/src/base/find_data/find_data.cpp
===================================================================
--- trunk/myserver/src/base/find_data/find_data.cpp	2009-03-29 20:34:36 UTC (rev 3039)
+++ trunk/myserver/src/base/find_data/find_data.cpp	2009-03-30 19:04:13 UTC (rev 3040)
@@ -84,7 +84,7 @@
    DirName.assign(filename);
    
    if(DirName[DirName.length() - 1] == '/')
-     DirName[DirName.length() - 1] = '\0';
+     DirName.erase(DirName.length() - 1);
      
    dh = opendir(DirName.c_str());
    if(dh == NULL)




From MAILER-DAEMON Mon Mar 30 15:42:13 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LoNN7-0004os-7S
	for mharc-myserver-commit@gnu.org; Mon, 30 Mar 2009 15:42:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LoNN6-0004om-Hl
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:42:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LoNN5-0004oW-4S
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:42:12 -0400
Received: from [199.232.76.173] (port=57126 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LoNN5-0004oT-0d
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:42:11 -0400
Received: from savannah.gnu.org ([199.232.41.3]:34889 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <alexandru.iancu@gmail.com>)
	id 1LoNN4-0005pk-O9
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 15:42:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alexandru.iancu@gmail.com>) id 1LoNN4-0003Nk-8O
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 19:42:10 +0000
Received: from andu by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <andu@savannah.gnu.org>) id 1LoNN3-0003Ng-U6
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 19:42:10 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: andu
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alexandru IANCU <alexandru.iancu@gmail.com>
Message-Id: <E1LoNN3-0003Ng-U6@cvs.savannah.gnu.org>
Date: Mon, 30 Mar 2009 19:42:10 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3041] disallow to cd into files
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2009 19:42:12 -0000

Revision: 3041
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3041
Author:   andu
Date:     2009-03-30 19:42:09 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
disallow to cd into files

Modified Paths:
--------------
    trunk/myserver/src/protocol/ftp/ftp.cpp

Modified: trunk/myserver/src/protocol/ftp/ftp.cpp
===================================================================
--- trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-30 19:04:13 UTC (rev 3040)
+++ trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-30 19:42:09 UTC (rev 3041)
@@ -2101,6 +2101,11 @@
   std::string sLocalPath;
   if ( !GetLocalPath(sPath, sLocalPath) )
     return;
+  if ( !FilesUtility::isDirectory(sLocalPath) )
+    {
+      ftp_reply(550);
+      return;
+    }
   FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
   assert(pFtpUserData != NULL);
   pFtpUserData->m_cwd = sLocalPath;




From MAILER-DAEMON Mon Mar 30 17:40:57 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LoPE1-00057Q-Ii
	for mharc-myserver-commit@gnu.org; Mon, 30 Mar 2009 17:40:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LoPDz-00054T-NC
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:40:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LoPDz-000539-5U
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:40:55 -0400
Received: from [199.232.76.173] (port=37133 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LoPDz-000530-1L
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:40:55 -0400
Received: from savannah.gnu.org ([199.232.41.3]:45670 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <alexandru.iancu@gmail.com>)
	id 1LoPDy-0004ve-PV
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:40:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alexandru.iancu@gmail.com>) id 1LoPDy-0005CL-7R
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 21:40:54 +0000
Received: from andu by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <andu@savannah.gnu.org>) id 1LoPDx-0005CH-S5
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 21:40:54 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: andu
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alexandru IANCU <alexandru.iancu@gmail.com>
Message-Id: <E1LoPDx-0005CH-S5@cvs.savannah.gnu.org>
Date: Mon, 30 Mar 2009 21:40:53 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3042] bug fix at directories browsing
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2009 21:40:55 -0000

Revision: 3042
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3042
Author:   andu
Date:     2009-03-30 21:40:53 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
bug fix at directories browsing

Modified Paths:
--------------
    trunk/myserver/src/protocol/ftp/ftp.cpp

Modified: trunk/myserver/src/protocol/ftp/ftp.cpp
===================================================================
--- trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-30 19:42:09 UTC (rev 3041)
+++ trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-30 21:40:53 UTC (rev 3042)
@@ -1496,7 +1496,9 @@
     return false;
   }
   ///////////////////////////////////////
-  
+  if ( FilesUtility::isDirectory(sOutPath) && 
+       (sOutPath[sOutPath.length()] != '/' || sOutPath[sOutPath.length()] != '\\') )
+    sOutPath.append("/");
   return true;
 }
 




From MAILER-DAEMON Mon Mar 30 17:44:59 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LoPHv-0007Ir-Ft
	for mharc-myserver-commit@gnu.org; Mon, 30 Mar 2009 17:44:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LoPHt-0007Ii-GJ
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:44:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LoPHs-0007IU-Fg
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:44:56 -0400
Received: from [199.232.76.173] (port=37348 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LoPHs-0007IR-Ar
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:44:56 -0400
Received: from savannah.gnu.org ([199.232.41.3]:45735 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <alexandru.iancu@gmail.com>)
	id 1LoPHs-0005gX-0V
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 17:44:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alexandru.iancu@gmail.com>) id 1LoPHr-0005Ss-Es
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 21:44:55 +0000
Received: from andu by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <andu@savannah.gnu.org>) id 1LoPHr-0005So-5f
	for myserver-commit@gnu.org; Mon, 30 Mar 2009 21:44:55 +0000
MIME-Version: 1.0
X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/
Errors-To: andu
To: myserver-commit@gnu.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alexandru IANCU <alexandru.iancu@gmail.com>
Message-Id: <E1LoPHr-0005So-5f@cvs.savannah.gnu.org>
Date: Mon, 30 Mar 2009 21:44:55 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [3043] bug fix at directory browsing
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2009 21:44:58 -0000

Revision: 3043
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3043
Author:   andu
Date:     2009-03-30 21:44:54 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
bug fix at directory browsing

Modified Paths:
--------------
    trunk/myserver/src/protocol/ftp/ftp.cpp

Modified: trunk/myserver/src/protocol/ftp/ftp.cpp
===================================================================
--- trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-30 21:40:53 UTC (rev 3042)
+++ trunk/myserver/src/protocol/ftp/ftp.cpp	2009-03-30 21:44:54 UTC (rev 3043)
@@ -1497,7 +1497,7 @@
   }
   ///////////////////////////////////////
   if ( FilesUtility::isDirectory(sOutPath) && 
-       (sOutPath[sOutPath.length()] != '/' || sOutPath[sOutPath.length()] != '\\') )
+       (sOutPath[sOutPath.length() - 1] != '/' || sOutPath[sOutPath.length() - 1] != '\\') )
     sOutPath.append("/");
   return true;
 }




