From MAILER-DAEMON Wed Jul 01 16:48:52 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MM6jc-0000oc-Dk
	for mharc-myserver-commit@gnu.org; Wed, 01 Jul 2009 16:48:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MM6ja-0000mM-4Q
	for myserver-commit@gnu.org; Wed, 01 Jul 2009 16:48:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MM6jZ-0000ku-0g
	for myserver-commit@gnu.org; Wed, 01 Jul 2009 16:48:49 -0400
Received: from [199.232.76.173] (port=35372 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MM6jY-0000kk-TE
	for myserver-commit@gnu.org; Wed, 01 Jul 2009 16:48:48 -0400
Received: from savannah.gnu.org ([199.232.41.3]:32923 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 1MM6jY-0007N0-Sz
	for myserver-commit@gnu.org; Wed, 01 Jul 2009 16:48:48 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MM6jY-0006IY-10
	for myserver-commit@gnu.org; Wed, 01 Jul 2009 20:48:48 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MM6jX-0006I7-La
	for myserver-commit@gnu.org; Wed, 01 Jul 2009 20:48:47 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 353f576d2995bc7adf504f41d4b3a8512c2f0d76
X-Git-Newrev: 72681110b146ae5c34dd8f165560f8e139e79063
Message-Id: <E1MM6jX-0006I7-La@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 01 Jul 2009 20:48:47 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 72681110b146ae5c34dd8f165560f8e139e79063
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: Wed, 01 Jul 2009 20:48:50 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  72681110b146ae5c34dd8f165560f8e139e79063 (commit)
      from  353f576d2995bc7adf504f41d4b3a8512c2f0d76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 72681110b146ae5c34dd8f165560f8e139e79063
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 1 22:49:26 2009 +0200

    Fixed a bug in the BitVec implementation and a new test case was added.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/bitvec/bitvec.h |    8 ++++----
 myserver/src/base/bitvec/bitvec.cpp   |    8 ++++----
 myserver/src/base/slab/Makefile.am    |    2 +-
 myserver/tests/test_bitvec.cpp        |   15 +++++++++++++++
 4 files changed, 24 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu Jul 02 17:32:15 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MMTt9-0008Id-Ju
	for mharc-myserver-commit@gnu.org; Thu, 02 Jul 2009 17:32:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MMTt7-0008GY-RT
	for myserver-commit@gnu.org; Thu, 02 Jul 2009 17:32:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MMTt6-0008Em-Fq
	for myserver-commit@gnu.org; Thu, 02 Jul 2009 17:32:12 -0400
Received: from [199.232.76.173] (port=35879 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MMTt6-0008Eb-AS
	for myserver-commit@gnu.org; Thu, 02 Jul 2009 17:32:12 -0400
Received: from savannah.gnu.org ([199.232.41.3]:38194 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 1MMTt6-0002Tz-1w
	for myserver-commit@gnu.org; Thu, 02 Jul 2009 17:32:12 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MMTt5-0000fj-LJ
	for myserver-commit@gnu.org; Thu, 02 Jul 2009 21:32:11 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MMTt4-0000fJ-Cl
	for myserver-commit@gnu.org; Thu, 02 Jul 2009 21:32:11 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 72681110b146ae5c34dd8f165560f8e139e79063
X-Git-Newrev: 8bfa1eeaf059c36e2af02a3753fc52d1c2c86281
Message-Id: <E1MMTt4-0000fJ-Cl@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 02 Jul 2009 21:32:10 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 8bfa1eeaf059c36e2af02a3753fc52d1c2c86281
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, 02 Jul 2009 21:32:14 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  8bfa1eeaf059c36e2af02a3753fc52d1c2c86281 (commit)
      from  72681110b146ae5c34dd8f165560f8e139e79063 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8bfa1eeaf059c36e2af02a3753fc52d1c2c86281
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 2 23:32:51 2009 +0200

    Added a new `BitVec::find' function, a new test and some comments.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/bitvec/bitvec.h |   30 +++++++++++++++++----
 myserver/src/base/bitvec/bitvec.cpp   |   45 ++++++++++++++++++++++++++++++--
 myserver/tests/test_bitvec.cpp        |   31 ++++++++++++++++++++++
 3 files changed, 97 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sat Jul 04 07:09:54 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MN37y-0008UP-3s
	for mharc-myserver-commit@gnu.org; Sat, 04 Jul 2009 07:09:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MN37u-0008TD-0a
	for myserver-commit@gnu.org; Sat, 04 Jul 2009 07:09:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MN37q-0008Sq-A3
	for myserver-commit@gnu.org; Sat, 04 Jul 2009 07:09:48 -0400
Received: from [199.232.76.173] (port=41817 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MN37o-0008Sh-CM
	for myserver-commit@gnu.org; Sat, 04 Jul 2009 07:09:44 -0400
Received: from savannah.gnu.org ([199.232.41.3]:33543 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 1MN37o-0003fk-3g
	for myserver-commit@gnu.org; Sat, 04 Jul 2009 07:09:44 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MN37n-0002GS-HO
	for myserver-commit@gnu.org; Sat, 04 Jul 2009 11:09:43 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MN37m-0002G2-3o
	for myserver-commit@gnu.org; Sat, 04 Jul 2009 11:09:43 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8bfa1eeaf059c36e2af02a3753fc52d1c2c86281
X-Git-Newrev: e997d69292159be746dd0ad08033392edf4d1e4a
Message-Id: <E1MN37m-0002G2-3o@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 04 Jul 2009 11:09:42 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. e997d69292159be746dd0ad08033392edf4d1e4a
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, 04 Jul 2009 11:09:51 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  e997d69292159be746dd0ad08033392edf4d1e4a (commit)
       via  f31df25a9c8048c900ee0de16f95f7fb50c4e44d (commit)
      from  8bfa1eeaf059c36e2af02a3753fc52d1c2c86281 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e997d69292159be746dd0ad08033392edf4d1e4a
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Jul 4 13:10:24 2009 +0200

    Use a connections cache in the server.

commit f31df25a9c8048c900ee0de16f95f7fb50c4e44d
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Jul 4 13:01:16 2009 +0200

    Allow data reallocation.  It is a destructive operation.

-----------------------------------------------------------------------

Summary of changes:
 myserver/documentation/virtual_hosts.texi          |    8 ++++
 myserver/include/base/bitvec/bitvec.h              |    6 +++
 myserver/include/base/slab/slab.h                  |   10 ++++-
 myserver/include/connection/connection.h           |   14 +++++-
 myserver/include/server/server.h                   |    5 ++
 myserver/src/base/bitvec/bitvec.cpp                |   17 +++++++
 myserver/src/connection/connection.cpp             |   10 ++--
 .../connections_scheduler.cpp                      |    1 -
 myserver/src/server/server.cpp                     |   45 ++++++++++++++-----
 myserver/tests/test_bitvec.cpp                     |   14 ++++++
 myserver/tests/test_slab.cpp                       |   14 ++++++
 11 files changed, 123 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun Jul 05 07:36:32 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MNQ1I-0005Dk-C2
	for mharc-myserver-commit@gnu.org; Sun, 05 Jul 2009 07:36:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MNQ1G-0005AZ-8Q
	for myserver-commit@gnu.org; Sun, 05 Jul 2009 07:36:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MNQ1F-00059T-K9
	for myserver-commit@gnu.org; Sun, 05 Jul 2009 07:36:29 -0400
Received: from [199.232.76.173] (port=33112 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MNQ1F-00059H-Cx
	for myserver-commit@gnu.org; Sun, 05 Jul 2009 07:36:29 -0400
Received: from savannah.gnu.org ([199.232.41.3]:39924 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 1MNQ1F-0006Si-38
	for myserver-commit@gnu.org; Sun, 05 Jul 2009 07:36:29 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MNQ1E-0007V2-9l
	for myserver-commit@gnu.org; Sun, 05 Jul 2009 11:36:28 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MNQ1C-0007US-IP
	for myserver-commit@gnu.org; Sun, 05 Jul 2009 11:36:28 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e997d69292159be746dd0ad08033392edf4d1e4a
X-Git-Newrev: caa2676dada81b25fa42d6806f9e5a60ee4783a0
Message-Id: <E1MNQ1C-0007US-IP@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 05 Jul 2009 11:36:26 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. caa2676dada81b25fa42d6806f9e5a60ee4783a0
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, 05 Jul 2009 11:36:30 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  caa2676dada81b25fa42d6806f9e5a60ee4783a0 (commit)
       via  0655f26e10982636dec73fb251d292816a108274 (commit)
       via  01180137ae3072e654ceb3d3ad18407c71f37186 (commit)
       via  a0f85c48fa0a781ff23acd794510629abaf40bba (commit)
       via  65351db5b9c719c7d1aa4060fffeda87e98c7cec (commit)
       via  4ad94d5273e66b32f447ec85a479b19a6bb25a72 (commit)
      from  e997d69292159be746dd0ad08033392edf4d1e4a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit caa2676dada81b25fa42d6806f9e5a60ee4783a0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 5 13:37:12 2009 +0200

    Now FTP supports the SIZE command.

commit 0655f26e10982636dec73fb251d292816a108274
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 5 13:36:07 2009 +0200

    Added basic logging features.

commit 01180137ae3072e654ceb3d3ad18407c71f37186
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 5 13:35:28 2009 +0200

    FTP parser refactoring.

commit a0f85c48fa0a781ff23acd794510629abaf40bba
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Jul 4 21:05:55 2009 +0200

    Fixed compiling problems under Windows.

commit 65351db5b9c719c7d1aa4060fffeda87e98c7cec
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 5 13:11:19 2009 +0200

    Write warnings/errors to the warning log file, no to the accesses log file.

commit 4ad94d5273e66b32f447ec85a479b19a6bb25a72
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Jul 4 21:05:55 2009 +0200

    Fixed compiling problems under Windows.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/file/file.h                  |    4 +-
 myserver/include/protocol/ftp/ftp.h                |    3 +-
 myserver/include/protocol/ftp/ftp_lexer.h          |    9 +-
 myserver/src/base/file/file.cpp                    |   24 +-
 myserver/src/base/file/files_utility.cpp           |    2 +-
 myserver/src/base/sync/semaphore.cpp               |   22 +-
 myserver/src/http_handler/cgi/cgi.cpp              |    2 +-
 myserver/src/http_handler/fastcgi/fastcgi.cpp      |    2 +-
 myserver/src/http_handler/http_file/http_file.cpp  |    2 +-
 myserver/src/http_handler/scgi/scgi.cpp            |    2 +-
 myserver/src/http_handler/wincgi/wincgi.cpp        |    6 +-
 myserver/src/log/stream/file_stream.cpp            |    4 +-
 myserver/src/protocol/control/control_protocol.cpp |   32 +-
 myserver/src/protocol/ftp/ftp.cpp                  |  162 +++++---
 myserver/src/protocol/ftp/ftp_lexer.cpp            |  402 ++++++++++---------
 myserver/src/protocol/ftp/ftp_lexer.lpp            |   39 ++-
 myserver/src/protocol/ftp/ftp_parser.cpp           |  409 ++++++++++----------
 myserver/src/protocol/ftp/ftp_parser.ypp           |   40 ++-
 myserver/src/protocol/http/http_data_read.cpp      |    2 +-
 myserver/src/server/server.cpp                     |    2 +-
 myserver/tests/test_file.cpp                       |    2 +-
 myserver/tests/test_ssl_socket.cpp                 |    4 +-
 22 files changed, 619 insertions(+), 557 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon Jul 06 18:28:33 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MNwfp-0001Yl-9B
	for mharc-myserver-commit@gnu.org; Mon, 06 Jul 2009 18:28:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MNwfm-0001Xm-Dc
	for myserver-commit@gnu.org; Mon, 06 Jul 2009 18:28:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MNwfm-0001XT-0t
	for myserver-commit@gnu.org; Mon, 06 Jul 2009 18:28:30 -0400
Received: from [199.232.76.173] (port=49344 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MNwfl-0001XO-Nl
	for myserver-commit@gnu.org; Mon, 06 Jul 2009 18:28:29 -0400
Received: from savannah.gnu.org ([199.232.41.3]:36181 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 1MNwfl-000655-1v
	for myserver-commit@gnu.org; Mon, 06 Jul 2009 18:28:29 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MNwfg-0007Kn-Gb
	for myserver-commit@gnu.org; Mon, 06 Jul 2009 22:28:24 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MNwff-0007KK-4Q
	for myserver-commit@gnu.org; Mon, 06 Jul 2009 22:28:24 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: caa2676dada81b25fa42d6806f9e5a60ee4783a0
X-Git-Newrev: 6beff98f993d0f2773b0069eca088148831f3f6e
Message-Id: <E1MNwff-0007KK-4Q@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 06 Jul 2009 22:28:23 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 6beff98f993d0f2773b0069eca088148831f3f6e
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, 06 Jul 2009 22:28:31 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  6beff98f993d0f2773b0069eca088148831f3f6e (commit)
       via  3a7dc57a7e6d37bcdaec218c22a59bf8af3536e0 (commit)
      from  caa2676dada81b25fa42d6806f9e5a60ee4783a0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6beff98f993d0f2773b0069eca088148831f3f6e
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 7 00:27:30 2009 +0200

    Fixed some tests failures under Windows. Some still remains.

commit 3a7dc57a7e6d37bcdaec218c22a59bf8af3536e0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Jul 6 11:59:41 2009 +0200

    Support libtre under Windows for regex matching.

-----------------------------------------------------------------------

Summary of changes:
 myserver/configure.in                              |    2 +
 myserver/include/base/file/file.h                  |    4 +-
 myserver/include/base/files_cache/cached_file.h    |    6 +-
 myserver/include/base/regex/myserver_regex.h       |   27 +++++-------
 myserver/include/filter/stream.h                   |    4 +-
 myserver/src/base/bitvec/bitvec.cpp                |    2 +-
 myserver/src/base/file/file.cpp                    |   18 ++++----
 myserver/src/base/files_cache/cached_file.cpp      |    8 ++--
 myserver/src/base/pipe/pipe.cpp                    |   15 +++----
 myserver/src/base/process/fork_server.cpp          |    2 +-
 .../src/base/process/process_server_manager.cpp    |    2 +-
 myserver/src/base/regex/myserver_regex.cpp         |   28 ++++++------
 .../src/connections_scheduler/listen_threads.cpp   |    2 +-
 myserver/src/protocol/ftp/ftp.cpp                  |    4 +-
 myserver/src/protocol/http/http.cpp                |   18 ++++----
 myserver/tests/test_bitvec.cpp                     |    1 -
 myserver/tests/test_cached_file.cpp                |    4 +-
 myserver/tests/test_connections_scheduler.cpp      |   10 ++--
 myserver/tests/test_file_stream.cpp                |   11 ++++-
 myserver/tests/test_log_manager.cpp                |   45 +++++++++++++++----
 20 files changed, 119 insertions(+), 94 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 07 14:12:35 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MOF9f-0007LN-4b
	for mharc-myserver-commit@gnu.org; Tue, 07 Jul 2009 14:12:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MOF9d-0007KJ-UE
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:12:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MOF9d-0007Jy-E6
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:12:33 -0400
Received: from [199.232.76.173] (port=39912 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MOF9d-0007Jq-Bc
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:12:33 -0400
Received: from savannah.gnu.org ([199.232.41.3]:55786 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 1MOF9d-0001aN-4Y
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:12:33 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MOF9c-000551-BF
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 18:12:32 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MOF9a-00054c-M8
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 18:12:32 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6beff98f993d0f2773b0069eca088148831f3f6e
X-Git-Newrev: 732254f2f0d9220c22ece845715552c6ca162e1c
Message-Id: <E1MOF9a-00054c-M8@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 07 Jul 2009 18:12:31 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 732254f2f0d9220c22ece845715552c6ca162e1c
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, 07 Jul 2009 18:12:34 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  732254f2f0d9220c22ece845715552c6ca162e1c (commit)
      from  6beff98f993d0f2773b0069eca088148831f3f6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 732254f2f0d9220c22ece845715552c6ca162e1c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 7 13:59:19 2009 +0200

    Now the tests suite is executed correctly under Windows too.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/file/file.h                  |    2 +
 myserver/src/base/file/file.cpp                    |   20 ++++-
 myserver/src/base/pipe/pipe.cpp                    |   23 ++++-
 myserver/src/base/socket/socket.cpp                |   15 ++-
 .../connections_scheduler.cpp                      |    4 +-
 myserver/src/log/stream/file_stream.cpp            |   95 +++-----------------
 myserver/tests/test_connections_scheduler.cpp      |    4 +-
 myserver/tests/test_file_stream.cpp                |    4 +
 myserver/tests/test_log_manager.cpp                |   63 ++++++++-----
 myserver/tests/test_utility.cpp                    |    8 +-
 10 files changed, 116 insertions(+), 122 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 07 14:45:05 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MOFf7-0000Hl-Iq
	for mharc-myserver-commit@gnu.org; Tue, 07 Jul 2009 14:45:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MOFf5-0000Gq-Qc
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:45:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MOFf5-0000GY-AN
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:45:03 -0400
Received: from [199.232.76.173] (port=33492 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MOFf5-0000GT-3K
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:45:03 -0400
Received: from savannah.gnu.org ([199.232.41.3]:35347 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 <francesco.pipita@gmail.com>)
	id 1MOFf4-0007bl-Mj
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 14:45:02 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <francesco.pipita@gmail.com>) id 1MOFf2-0007Xe-If
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 18:45:00 +0000
Received: from francesco_pipita by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <francesco_pipita@savannah.gnu.org>)
	id 1MOFf1-0007XD-F8
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 18:45:00 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 732254f2f0d9220c22ece845715552c6ca162e1c
X-Git-Newrev: f33a2af50454e37f33caa3b2ac30518c5377ffef
Message-Id: <E1MOFf1-0007XD-F8@cvs.savannah.gnu.org>
From: Francesco Pipita <francesco.pipita@gmail.com>
Date: Tue, 07 Jul 2009 18:44:59 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. f33a2af50454e37f33caa3b2ac30518c5377ffef
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, 07 Jul 2009 18:45:04 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  f33a2af50454e37f33caa3b2ac30518c5377ffef (commit)
      from  732254f2f0d9220c22ece845715552c6ca162e1c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f33a2af50454e37f33caa3b2ac30518c5377ffef
Author: Francesco Pipita <francesco.pipita@gmail.com>
Date:   Tue Jul 7 20:26:23 2009 +0200

    Little portability improvement.
    
    Preprocessor directives aren't used anymore to setup the line
    terminator sequence. The C++ endl symbol is used instead.

-----------------------------------------------------------------------

Summary of changes:
 myserver/tests/test_file_stream.cpp |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 07 15:26:54 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MOGJZ-0002NK-QA
	for mharc-myserver-commit@gnu.org; Tue, 07 Jul 2009 15:26:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MOGJY-0002M0-4I
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 15:26:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MOGJX-0002LJ-A4
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 15:26:51 -0400
Received: from [199.232.76.173] (port=36269 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MOGJW-0002LA-Oo
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 15:26:50 -0400
Received: from savannah.gnu.org ([199.232.41.3]:55680 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 1MOGJW-0005kd-EK
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 15:26:50 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MOGJV-0001gl-Vr
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 19:26:50 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MOGJV-0001gK-IL
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 19:26:49 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f33a2af50454e37f33caa3b2ac30518c5377ffef
X-Git-Newrev: 17b5971527d1792a5e30fd757e4024f24a8eb977
Message-Id: <E1MOGJV-0001gK-IL@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 07 Jul 2009 19:26:49 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 17b5971527d1792a5e30fd757e4024f24a8eb977
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, 07 Jul 2009 19:26:52 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  17b5971527d1792a5e30fd757e4024f24a8eb977 (commit)
       via  bba65b27b7d88317e971d37f01a39d0903b3ad61 (commit)
       via  3d30ca835218616a1f49061cfa400b5c81416c4e (commit)
      from  f33a2af50454e37f33caa3b2ac30518c5377ffef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 17b5971527d1792a5e30fd757e4024f24a8eb977
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 7 21:27:11 2009 +0200

    File class refactoring: some parts rewritten to be more readable.

commit bba65b27b7d88317e971d37f01a39d0903b3ad61
Merge: 3d30ca835218616a1f49061cfa400b5c81416c4e f33a2af50454e37f33caa3b2ac30518c5377ffef
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 7 20:46:26 2009 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver

commit 3d30ca835218616a1f49061cfa400b5c81416c4e
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 7 20:44:39 2009 +0200

    File truncate supports the desired size now.  A test was added.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/file/file.h |    2 +-
 myserver/src/base/file/file.cpp   |  254 ++++++++++++++----------------------
 myserver/src/base/pipe/pipe.cpp   |    4 +-
 myserver/tests/test_file.cpp      |   60 +++++++--
 4 files changed, 147 insertions(+), 173 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 07 16:10:05 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MOGzN-0000mF-7I
	for mharc-myserver-commit@gnu.org; Tue, 07 Jul 2009 16:10:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MOGzM-0000mA-FS
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 16:10:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MOGzL-0000ly-3i
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 16:10:03 -0400
Received: from [199.232.76.173] (port=34772 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MOGzK-0000lv-Uu
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 16:10:02 -0400
Received: from savannah.gnu.org ([199.232.41.3]:59733 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 1MOGzK-0002T3-JW
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 16:10:02 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MOGzJ-0004Vz-PC
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 20:10:01 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MOGzJ-0004VG-6M
	for myserver-commit@gnu.org; Tue, 07 Jul 2009 20:10:01 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 17b5971527d1792a5e30fd757e4024f24a8eb977
X-Git-Newrev: 03a904f9a9cceb8616d4e9a7e06348a2831e6c4c
Message-Id: <E1MOGzJ-0004VG-6M@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 07 Jul 2009 20:10:01 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 03a904f9a9cceb8616d4e9a7e06348a2831e6c4c
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, 07 Jul 2009 20:10:04 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  03a904f9a9cceb8616d4e9a7e06348a2831e6c4c (commit)
      from  17b5971527d1792a5e30fd757e4024f24a8eb977 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03a904f9a9cceb8616d4e9a7e06348a2831e6c4c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 7 22:08:22 2009 +0200

    Free the resources used by the TestFileStreamCreator::testCreation test.

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/base/file/file.cpp             |    6 +++---
 myserver/tests/test_file_stream_creator.cpp |    7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 08 14:19:17 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MObjh-0005CM-Pu
	for mharc-myserver-commit@gnu.org; Wed, 08 Jul 2009 14:19:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MObjg-0005C4-HT
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 14:19:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MObje-0005BZ-Vm
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 14:19:15 -0400
Received: from [199.232.76.173] (port=36942 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MObje-0005BM-QY
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 14:19:14 -0400
Received: from savannah.gnu.org ([199.232.41.3]:32940 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 1MObje-0004bb-I5
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 14:19:14 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MObje-0005XA-1E
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 18:19:14 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MObjc-0005WZ-4r
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 18:19:13 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 03a904f9a9cceb8616d4e9a7e06348a2831e6c4c
X-Git-Newrev: aca640a5a1c30e7505f52262e392609545f8c06c
Message-Id: <E1MObjc-0005WZ-4r@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 08 Jul 2009 18:19:12 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. aca640a5a1c30e7505f52262e392609545f8c06c
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: Wed, 08 Jul 2009 18:19:16 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  aca640a5a1c30e7505f52262e392609545f8c06c (commit)
       via  0f7f04fad0bbd778adb23d61d9555322ddd07712 (commit)
       via  0d287cff7477797ee2e6e2b563685d8faf74ecb0 (commit)
       via  48d4710a14dc3387bf04c685b1e6b6fad623ae5a (commit)
      from  03a904f9a9cceb8616d4e9a7e06348a2831e6c4c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aca640a5a1c30e7505f52262e392609545f8c06c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 8 20:19:41 2009 +0200

    Fix the termination test for the hashing function.

commit 0f7f04fad0bbd778adb23d61d9555322ddd07712
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 8 20:19:12 2009 +0200

    Fixed a possible segfault when the server is lazily loaded.

commit 0d287cff7477797ee2e6e2b563685d8faf74ecb0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 8 20:17:36 2009 +0200

    Throw an error if the base interface is used by mistake.

commit 48d4710a14dc3387bf04c685b1e6b6fad623ae5a
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 8 20:17:01 2009 +0200

    Use the interface signature for the send method.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/http_handler/cgi/cgi.h            |    6 +++---
 .../src/base/process/process_server_manager.cpp    |    7 +++----
 myserver/src/http_handler/cgi/cgi.cpp              |    6 ++----
 myserver/src/http_handler/fastcgi/fastcgi.cpp      |    2 +-
 myserver/src/http_handler/scgi/scgi.cpp            |    2 +-
 myserver/src/protocol/http/http.cpp                |   10 ++--------
 myserver/src/protocol/http/http_data_handler.cpp   |    5 +++--
 7 files changed, 15 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 08 19:13:35 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MOgKU-0004MD-Vs
	for mharc-myserver-commit@gnu.org; Wed, 08 Jul 2009 19:13:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MOgKT-0004M6-SA
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 19:13:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MOgKT-0004Ll-7H
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 19:13:33 -0400
Received: from [199.232.76.173] (port=48085 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MOgKT-0004Li-59
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 19:13:33 -0400
Received: from savannah.gnu.org ([199.232.41.3]:34756 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 1MOgKS-0003Fo-Sp
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 19:13:33 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MOgKS-0000go-BE
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 23:13:32 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MOgKQ-0000g9-GX
	for myserver-commit@gnu.org; Wed, 08 Jul 2009 23:13:32 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: aca640a5a1c30e7505f52262e392609545f8c06c
X-Git-Newrev: 321a84cc8e98041e11e0cdf9efa3730e2b18ebdf
Message-Id: <E1MOgKQ-0000g9-GX@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 08 Jul 2009 23:13:31 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 321a84cc8e98041e11e0cdf9efa3730e2b18ebdf
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: Wed, 08 Jul 2009 23:13:34 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  321a84cc8e98041e11e0cdf9efa3730e2b18ebdf (commit)
       via  e7c184f737c4b2c6d70a636862a4afad72566778 (commit)
      from  aca640a5a1c30e7505f52262e392609545f8c06c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 321a84cc8e98041e11e0cdf9efa3730e2b18ebdf
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 9 01:08:20 2009 +0200

    Fixed BitVec problems on 64 bits systems.

commit e7c184f737c4b2c6d70a636862a4afad72566778
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 8 22:29:08 2009 +0200

    FilesUtility::deleteFile doesn't fail if the file is not found.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/bitvec/bitvec.h    |    8 ++++----
 myserver/src/base/bitvec/bitvec.cpp      |    8 ++++----
 myserver/src/base/file/files_utility.cpp |   11 +++++++----
 myserver/tests/test_bitvec.cpp           |   15 +++++++++------
 4 files changed, 24 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun Jul 12 17:43:31 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MQ6pX-0008Qp-EZ
	for mharc-myserver-commit@gnu.org; Sun, 12 Jul 2009 17:43:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MQ6pV-0008QG-Om
	for myserver-commit@gnu.org; Sun, 12 Jul 2009 17:43:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MQ6pV-0008Pi-1W
	for myserver-commit@gnu.org; Sun, 12 Jul 2009 17:43:29 -0400
Received: from [199.232.76.173] (port=35692 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MQ6pU-0008Pe-TY
	for myserver-commit@gnu.org; Sun, 12 Jul 2009 17:43:28 -0400
Received: from savannah.gnu.org ([199.232.41.3]:52779 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 1MQ6pU-0004pI-0p
	for myserver-commit@gnu.org; Sun, 12 Jul 2009 17:43:28 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MQ6pT-0001zb-Fm
	for myserver-commit@gnu.org; Sun, 12 Jul 2009 21:43:27 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MQ6pR-0001yB-NC
	for myserver-commit@gnu.org; Sun, 12 Jul 2009 21:43:27 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 321a84cc8e98041e11e0cdf9efa3730e2b18ebdf
X-Git-Newrev: f8ea478aa559da9ae63826a303b7d71f63d564bd
Message-Id: <E1MQ6pR-0001yB-NC@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 12 Jul 2009 21:43:26 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. f8ea478aa559da9ae63826a303b7d71f63d564bd
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, 12 Jul 2009 21:43:30 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  f8ea478aa559da9ae63826a303b7d71f63d564bd (commit)
       via  f8d3a99344bcf9cca39cf589ad3e8f40bf067da2 (commit)
      from  321a84cc8e98041e11e0cdf9efa3730e2b18ebdf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f8ea478aa559da9ae63826a303b7d71f63d564bd
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 12 23:41:28 2009 +0200

    Check if the input file is valid before use it.

commit f8d3a99344bcf9cca39cf589ad3e8f40bf067da2
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 12 23:37:53 2009 +0200

    Specify the payload length in the header.

-----------------------------------------------------------------------

Summary of changes:
 misc/py_control_client/pycontrol/pycontrol.py      |    5 ++-
 myserver/src/protocol/control/control_protocol.cpp |   37 ++++++-------------
 2 files changed, 15 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 14 05:42:00 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MQeWO-0007cV-6f
	for mharc-myserver-commit@gnu.org; Tue, 14 Jul 2009 05:42:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MQeWL-0007ZM-RW
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 05:41:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MQeWJ-0007XM-Rj
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 05:41:56 -0400
Received: from [199.232.76.173] (port=47289 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MQeWJ-0007Ww-Hd
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 05:41:55 -0400
Received: from savannah.gnu.org ([199.232.41.3]:59501 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 1MQeWJ-0006o6-8S
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 05:41:55 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MQeWI-0005l4-AS
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 09:41:54 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MQeWH-0005kd-N6
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 09:41:54 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f8ea478aa559da9ae63826a303b7d71f63d564bd
X-Git-Newrev: 1d9f422d7c108736f670b4c918f5a401b6ecb7a1
Message-Id: <E1MQeWH-0005kd-N6@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 14 Jul 2009 09:41:53 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 1d9f422d7c108736f670b4c918f5a401b6ecb7a1
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, 14 Jul 2009 09:41:58 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  1d9f422d7c108736f670b4c918f5a401b6ecb7a1 (commit)
       via  71fa1a71b9090f044f6c9bd8ef366d6bba650960 (commit)
      from  f8ea478aa559da9ae63826a303b7d71f63d564bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d9f422d7c108736f670b4c918f5a401b6ecb7a1
Merge: 71fa1a71b9090f044f6c9bd8ef366d6bba650960 f8ea478aa559da9ae63826a303b7d71f63d564bd
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 14 11:42:36 2009 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver

commit 71fa1a71b9090f044f6c9bd8ef366d6bba650960
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 14 11:14:37 2009 +0200

    Don't segfault when the fork server is used.

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/myserver.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 14 18:09:14 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MQqBV-0002l8-0J
	for mharc-myserver-commit@gnu.org; Tue, 14 Jul 2009 18:09:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MQqBT-0002kL-3R
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:09:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MQqBR-0002jK-70
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:09:10 -0400
Received: from [199.232.76.173] (port=57632 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MQqBQ-0002jE-QE
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:09:09 -0400
Received: from savannah.gnu.org ([199.232.41.3]:43619 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 1MQqBQ-00027R-AA
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:09:08 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <dperrone@it.gnu.org>) id 1MQqBP-0005c3-Tb
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 22:09:07 +0000
Received: from dperrone by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <dperrone@savannah.gnu.org>) id 1MQqBN-0005bb-Nu
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 22:09:07 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1d9f422d7c108736f670b4c918f5a401b6ecb7a1
X-Git-Newrev: b9b85c4b4f47797cccfbd8112780d1d0aeee9e09
Message-Id: <E1MQqBN-0005bb-Nu@cvs.savannah.gnu.org>
From: Daniele Perrone <dperrone@it.gnu.org>
Date: Tue, 14 Jul 2009 22:09:06 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. b9b85c4b4f47797cccfbd8112780d1d0aeee9e09
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, 14 Jul 2009 22:09:11 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  b9b85c4b4f47797cccfbd8112780d1d0aeee9e09 (commit)
       via  06db02885b85eafa7d5173260fa81ee46dc614d6 (commit)
      from  1d9f422d7c108736f670b4c918f5a401b6ecb7a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b9b85c4b4f47797cccfbd8112780d1d0aeee9e09
Merge: 06db02885b85eafa7d5173260fa81ee46dc614d6 1d9f422d7c108736f670b4c918f5a401b6ecb7a1
Author: Daniele Perrone <dperrone@it.gnu.org>
Date:   Tue Jul 14 21:14:37 2009 +0200

    Added more error messages on http protocol.

commit 06db02885b85eafa7d5173260fa81ee46dc614d6
Author: Daniele Perrone <dperrone@it.gnu.org>
Date:   Tue Jul 14 20:46:20 2009 +0200

    Added more error messages on http protocol.

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/protocol/http/http.cpp              | 2491 +++++++++++-----------
 myserver/src/protocol/http/http_data_handler.cpp |  146 +-
 2 files changed, 1366 insertions(+), 1271 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 14 18:11:02 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MQqDG-0003JM-Bl
	for mharc-myserver-commit@gnu.org; Tue, 14 Jul 2009 18:11:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MQqDF-0003Ir-0K
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:11:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MQqDE-0003I8-4F
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:11:00 -0400
Received: from [199.232.76.173] (port=57687 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MQqDE-0003I0-0V
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:11:00 -0400
Received: from savannah.gnu.org ([199.232.41.3]:55200 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 1MQqDD-0002Q7-LN
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:10:59 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MQqDD-0006Qu-BR
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 22:10:59 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MQqDC-0006QT-Uu
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 22:10:59 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b9b85c4b4f47797cccfbd8112780d1d0aeee9e09
X-Git-Newrev: d8377d254cb7e319b3462c108c2f71873f6cc142
Message-Id: <E1MQqDC-0006QT-Uu@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 14 Jul 2009 22:10:59 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. d8377d254cb7e319b3462c108c2f71873f6cc142
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, 14 Jul 2009 22:11:01 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  d8377d254cb7e319b3462c108c2f71873f6cc142 (commit)
       via  d150a72e0a7f6d7a93bc559b1941c97beda26382 (commit)
       via  becba65d2cf4818464debd8d8566fa7d1c33025f (commit)
      from  b9b85c4b4f47797cccfbd8112780d1d0aeee9e09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d8377d254cb7e319b3462c108c2f71873f6cc142
Merge: d150a72e0a7f6d7a93bc559b1941c97beda26382 b9b85c4b4f47797cccfbd8112780d1d0aeee9e09
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 00:10:19 2009 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver

commit d150a72e0a7f6d7a93bc559b1941c97beda26382
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 14 23:24:23 2009 +0200

    Some variables were renamed and additional refactoring.

commit becba65d2cf4818464debd8d8566fa7d1c33025f
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Jul 14 22:57:21 2009 +0200

    A value of 0 is valid for a handle.  Use -1 instead.

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/filter/stream.cpp                     |   16 +-
 myserver/src/protocol/control/control_protocol.cpp |  672 ++++++++++----------
 2 files changed, 342 insertions(+), 346 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Jul 14 18:27:41 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MQqTN-0004in-Ek
	for mharc-myserver-commit@gnu.org; Tue, 14 Jul 2009 18:27:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MQqTM-0004iO-8D
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:27:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MQqTL-0004hq-7z
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:27:39 -0400
Received: from [199.232.76.173] (port=52636 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MQqTL-0004hm-30
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:27:39 -0400
Received: from savannah.gnu.org ([199.232.41.3]:39197 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 1MQqTK-0001Wn-Jz
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 18:27:38 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MQqTK-0005ex-8h
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 22:27:38 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MQqTJ-0005eE-Uf
	for myserver-commit@gnu.org; Tue, 14 Jul 2009 22:27:38 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d8377d254cb7e319b3462c108c2f71873f6cc142
X-Git-Newrev: 2ee03386dcd9d88862e2924a86c4fdc4af296441
Message-Id: <E1MQqTJ-0005eE-Uf@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 14 Jul 2009 22:27:38 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 2ee03386dcd9d88862e2924a86c4fdc4af296441
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, 14 Jul 2009 22:27:40 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  2ee03386dcd9d88862e2924a86c4fdc4af296441 (commit)
      from  d8377d254cb7e319b3462c108c2f71873f6cc142 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2ee03386dcd9d88862e2924a86c4fdc4af296441
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 00:27:33 2009 +0200

    Fix a compiling error introduced by the last changes.

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/protocol/http/http_data_handler.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 15 11:20:41 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MR6Hh-0003FE-Q6
	for mharc-myserver-commit@gnu.org; Wed, 15 Jul 2009 11:20:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MR6Hf-0003EY-J0
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 11:20:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MR6He-0003E4-Ow
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 11:20:39 -0400
Received: from [199.232.76.173] (port=47915 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MR6He-0003Du-HL
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 11:20:38 -0400
Received: from savannah.gnu.org ([199.232.41.3]:54149 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 1MR6He-0005Ih-9T
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 11:20:38 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <dperrone@it.gnu.org>) id 1MR6Hd-00006h-GP
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 15:20:37 +0000
Received: from dperrone by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <dperrone@savannah.gnu.org>) id 1MR6Hb-000064-3A
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 15:20:37 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2ee03386dcd9d88862e2924a86c4fdc4af296441
X-Git-Newrev: 8a87cbea5ad656038b5d01610c48155470c86257
Message-Id: <E1MR6Hb-000064-3A@cvs.savannah.gnu.org>
From: Daniele Perrone <dperrone@it.gnu.org>
Date: Wed, 15 Jul 2009 15:20:35 +0000
X-detected-operating-system: by monty-python.gnu.org: Error: This connection
	is not (no longer?) in the cache.
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 8a87cbea5ad656038b5d01610c48155470c86257
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: Wed, 15 Jul 2009 15:20:40 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  8a87cbea5ad656038b5d01610c48155470c86257 (commit)
       via  68295017c448b6d970d82e797e7499aaf0d9e161 (commit)
      from  2ee03386dcd9d88862e2924a86c4fdc4af296441 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a87cbea5ad656038b5d01610c48155470c86257
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 12:51:23 2009 +0200

    Fixed a problem with FTP when an user/password is provided.

commit 68295017c448b6d970d82e797e7499aaf0d9e161
Author: Daniele Perrone <dperrone@it.gnu.org>
Date:   Wed Jul 15 15:26:15 2009 +0200

    Refactoring plugins management. Added stronger error management.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/plugin/plugin.h          |    6 +-
 myserver/include/plugin/plugins_manager.h |   65 ++-
 myserver/src/plugin/plugin.cpp            |   10 +-
 myserver/src/plugin/plugins_manager.cpp   |  840 ++++++++++++++++-------------
 myserver/src/protocol/ftp/ftp.cpp         |   72 +--
 myserver/src/server/server.cpp            |    6 +-
 6 files changed, 529 insertions(+), 470 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 15 13:42:32 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MR8Uy-00062U-AP
	for mharc-myserver-commit@gnu.org; Wed, 15 Jul 2009 13:42:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MR8Uw-00062L-HW
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 13:42:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MR8Uv-000627-R6
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 13:42:29 -0400
Received: from [199.232.76.173] (port=41809 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MR8Uv-000624-Nu
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 13:42:29 -0400
Received: from savannah.gnu.org ([199.232.41.3]:60439 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 1MR8Ut-0008DC-Hs
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 13:42:28 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MR8Us-0008SS-EK
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 17:42:26 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MR8Uq-0008RT-Rh
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 17:42:26 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8a87cbea5ad656038b5d01610c48155470c86257
X-Git-Newrev: 4738b59f0b91d65cb4bb327d522669c2c83111c0
Message-Id: <E1MR8Uq-0008RT-Rh@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 15 Jul 2009 17:42:25 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 4738b59f0b91d65cb4bb327d522669c2c83111c0
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: Wed, 15 Jul 2009 17:42:30 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  4738b59f0b91d65cb4bb327d522669c2c83111c0 (commit)
       via  58d5bc95edee9bb3bfaac181b57953586c0f1969 (commit)
      from  8a87cbea5ad656038b5d01610c48155470c86257 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4738b59f0b91d65cb4bb327d522669c2c83111c0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 17:44:31 2009 +0200

    Fixed plugins compiling issues.

commit 58d5bc95edee9bb3bfaac181b57953586c0f1969
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 17:26:33 2009 +0200

    Add the `Server::getXmlConfiguration ()' method, new code should not use it but `Server::getNodeTree ()'.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/server/server.h                   |    6 +-
 myserver/src/server/server.cpp                     |   27 ++-
 plugins/src/http_checker/http_checker.cpp          |  347 ++++++++++----------
 .../python_http_handler/python_http_handler.cpp    |   72 ++--
 plugins/src/rules_checker/rules_checker.cpp        |  189 ++++++------
 5 files changed, 330 insertions(+), 311 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 15 14:28:28 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MR9DQ-0002Gc-4V
	for mharc-myserver-commit@gnu.org; Wed, 15 Jul 2009 14:28:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MR9DN-0002Dj-5r
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 14:28:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MR9DM-0002DJ-CO
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 14:28:24 -0400
Received: from [199.232.76.173] (port=45736 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MR9DM-0002D9-50
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 14:28:24 -0400
Received: from savannah.gnu.org ([199.232.41.3]:52700 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 1MR9DL-0006qd-JB
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 14:28:23 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MR9DK-0001Lx-RS
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 18:28:22 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MR9DJ-0001Kx-St
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 18:28:22 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4738b59f0b91d65cb4bb327d522669c2c83111c0
X-Git-Newrev: 06b01dc7289a36b1e0b85147cb973c650d87d8f9
Message-Id: <E1MR9DJ-0001Kx-St@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 15 Jul 2009 18:28:22 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 06b01dc7289a36b1e0b85147cb973c650d87d8f9
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: Wed, 15 Jul 2009 18:28:25 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  06b01dc7289a36b1e0b85147cb973c650d87d8f9 (commit)
       via  3c78cbe3f78cc7965876f5ab43a5f0fd098a57fd (commit)
      from  4738b59f0b91d65cb4bb327d522669c2c83111c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 06b01dc7289a36b1e0b85147cb973c650d87d8f9
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 20:20:05 2009 +0200

    Specify the error when SSL cannot be initialized.

diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index 1811dcb..730671c 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -33,17 +33,17 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 }
 
-SslContext::SslContext()
+SslContext::SslContext ()
 {
   context = 0;
   method = 0;
 
-  certificateFile.assign("");
-  privateKeyFile.assign("");
+  certificateFile.assign ("");
+  privateKeyFile.assign ("");
 }
 
 /*!
- *Initialize SSL on the virtual host.
+ * Initialize SSL on the virtual host.
  */
 int SslContext::initialize ()
 {
@@ -55,16 +55,17 @@ int SslContext::initialize ()
   if (!context)
     return -1;
   /*
-   *The specified file doesn't exist.
+   * The specified file doesn't exist.
    */
-  if (FilesUtility::fileExists(certificateFile.c_str()) == 0)
+  if (FilesUtility::fileExists (certificateFile.c_str ()) == 0)
     return -1;
-  
-  if (SSL_CTX_use_certificate_file (context, certificateFile.c_str (),SSL_FILETYPE_PEM) != 1)
+
+  if (SSL_CTX_use_certificate_file (context, certificateFile.c_str (),
+                                    SSL_FILETYPE_PEM) != 1)
     return -1;
 
   /*
-   *The specified file doesn't exist.
+   * The specified file doesn't exist.
    */
   if (FilesUtility::fileExists(privateKeyFile) == 0)
     return -1;
@@ -80,11 +81,11 @@ int SslContext::free ()
 {
   int ret = 0;
   if (context)
-  {
-    SSL_CTX_free (context);
-    ret = 1;
-    context = 0;
-  }
+    {
+      SSL_CTX_free (context);
+      ret = 1;
+      context = 0;
+    }
   else 
     ret = 0;
   certificateFile.assign ("");
diff --git a/myserver/src/conf/vhost/vhost_manager.cpp b/myserver/src/conf/vhost/vhost_manager.cpp
index 59569e5..58f2ade 100644
--- a/myserver/src/conf/vhost/vhost_manager.cpp
+++ b/myserver/src/conf/vhost/vhost_manager.cpp
@@ -325,15 +325,16 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
     }
   doc = parser.getDoc();
   node = doc->children->children;
-  for(;node;node = node->next )
+
+  for (;node;node = node->next )
     {
       xmlNodePtr lcur;
       Vhost *vh;
-      if(xmlStrcmp(node->name, (const xmlChar *)"VHOST"))
+      if (xmlStrcmp (node->name, (const xmlChar *)"VHOST"))
         continue;
-      lcur=node->children;
-      vh=new Vhost(logManager);
-      if(vh == 0)
+      lcur = node->children;
+      vh = new Vhost (logManager);
+      if (vh == 0)
         {
           parser.close();
           clean();
@@ -341,137 +342,130 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
           Server::getInstance()->logWriteln(errMsg.c_str(), MYSERVER_LOG_MSG_ERROR);
           return -1;
         }
-    
-      SslContext* sslContext = vh->getVhostSSLContext();
-    
-      while(lcur)
+
+      SslContext* sslContext = vh->getVhostSSLContext ();
+
+      while (lcur)
         {
           XmlConf::build (lcur,
                           &vh->hashedDataTrees,
                           &vh->hashedData);
 
-          if(!xmlStrcmp(lcur->name, (const xmlChar *)"HOST"))
+          if (!xmlStrcmp (lcur->name, (const xmlChar *)"HOST"))
             {
               int useRegex = 0;
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
                 {
-                  if(!xmlStrcmp(attrs->name, (const xmlChar *)"isRegex"))
-                    {
-                      if(attrs->children && attrs->children->content && 
-                         (!xmlStrcmp(attrs->children->content, 
+                  if (!xmlStrcmp (attrs->name, (const xmlChar *)"isRegex")
+                      && attrs->children && attrs->children->content
+                      && (!xmlStrcmp(attrs->children->content,
                                      (const xmlChar *)"YES")))
-                        {
-                          useRegex = 1;
-                        }
-                    }
+                        useRegex = 1;
                 }
 
-              vh->addHost((const char*)lcur->children->content, useRegex);
+              vh->addHost ((const char*)lcur->children->content, useRegex);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"NAME"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"NAME"))
             {
-              vh->setName((char*)lcur->children->content);
+              vh->setName ((char*)lcur->children->content);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"LOCATION"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"LOCATION"))
             {
               string loc (vh->getDocumentRoot());
               loc.append ("/");
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
                 {
-                  if(!xmlStrcmp (attrs->name, (const xmlChar *)"path"))
+                  if (!xmlStrcmp (attrs->name, (const xmlChar *)"path"))
                     loc.append ((const char*) attrs->children->content);
                 }
               MimeRecord *rc = MimeManager::readRecord (lcur);
               vh->locationsMime.put (loc, rc);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SSL_PRIVATEKEY"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_PRIVATEKEY"))
             {
-              string pk((char*)lcur->children->content);
-              sslContext->setPrivateKeyFile(pk);
+              string pk ((char*)lcur->children->content);
+              sslContext->setPrivateKeyFile (pk);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SSL_CERTIFICATE"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_CERTIFICATE"))
             {
               string certificate((char*)lcur->children->content);
               sslContext->setCertificateFile(certificate);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"CONNECTIONS_PRIORITY"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"CONNECTIONS_PRIORITY"))
             {
-              vh->setDefaultPriority(atoi((const char*)lcur->children->content));
+              vh->setDefaultPriority (atoi ((const char*)lcur->children->content));
 
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SSL_PASSWORD"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_PASSWORD"))
             {
               string pw;
-              if(lcur->children)
-                pw.assign((char*)lcur->children->content);
+              if (lcur->children)
+                pw.assign ((char*)lcur->children->content);
               else
-                pw.assign("");
-
-              sslContext->setPassword(pw);
+                pw.assign ("");
 
+              sslContext->setPassword (pw);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"IP"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"IP"))
             {
               int useRegex = 0;
-              xmlAttr *attrs =  lcur->properties;
-              while(attrs)
+              xmlAttr *attrs = lcur->properties;
+
+              while (attrs)
                 {
-                  if(!xmlStrcmp(attrs->name, (const xmlChar *)"isRegex"))
+                  if (!xmlStrcmp(attrs->name, (const xmlChar *)"isRegex"))
                     {
-                      if(attrs->children && attrs->children->content && 
-                         (!xmlStrcmp(attrs->children->content, 
-                                     (const xmlChar *)"YES")))
-                        {
-                          useRegex = 1;
-                        }
+                      if (attrs->children && attrs->children->content && 
+                          (!xmlStrcmp(attrs->children->content, 
+                                      (const xmlChar *)"YES")))
+                        useRegex = 1;
                     }
                   attrs = attrs->next;
                 }
-              vh->addIP((char*)lcur->children->content, useRegex);
+              vh->addIP ((char*)lcur->children->content, useRegex);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"PORT"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"PORT"))
             {
-              int val = atoi((char*)lcur->children->content);
-              if(val > (1 << 16) || strlen((const char*)lcur->children->content) > 6)
+              int val = atoi ((char*)lcur->children->content);
+              if (val > (1 << 16) || strlen ((const char*)lcur->children->content) > 6)
                 {
-                  errMsg.assign("Error: specified port greater than 65536 or invalid: ");
-                  errMsg.append((char*)lcur->children->content);
-                  Server::getInstance()->logWriteln(errMsg.c_str(), MYSERVER_LOG_MSG_ERROR);
+                  errMsg.assign ("Error: specified port greater than 65536 or invalid: ");
+                  errMsg.append ((char*)lcur->children->content);
+                  Server::getInstance()->logWriteln (errMsg.c_str(),
+                                                     MYSERVER_LOG_MSG_ERROR);
                 }
-              vh->setPort((u_short)val);
+              vh->setPort ((u_short)val);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"PROTOCOL"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"PROTOCOL"))
             {
               char* lastChar = (char*)lcur->children->content;
-              while(*lastChar != '\0')
+              while (*lastChar != '\0')
                 {
                   *lastChar = tolower (*lastChar);
                   lastChar++;
                 }
-              vh->setProtocolName((char*)lcur->children->content);
+              vh->setProtocolName ((char*)lcur->children->content);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"DOCROOT"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"DOCROOT"))
             {
-              if(lcur->children && lcur->children->content)
+              if (lcur->children && lcur->children->content)
                 {
                   char* lastChar = (char*)lcur->children->content;
-                  while(*(lastChar+1) != '\0')
+                  while (*(lastChar+1) != '\0')
                     lastChar++;
 
-                  if(*lastChar == '\\' || *lastChar == '/')
+                  if (*lastChar == '\\' || *lastChar == '/')
                     {
                       *lastChar = '\0';
                     }
-                  vh->setDocumentRoot((const char*)lcur->children->content);
+                  vh->setDocumentRoot ((const char*)lcur->children->content);
                 }
               else
-                {
-                  vh->setDocumentRoot("");
-                }
+                vh->setDocumentRoot ("");
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SYSFOLDER"))
+          else if (!xmlStrcmp(lcur->name, (const xmlChar *)"SYSFOLDER"))
             {
-              if(lcur->children && lcur->children->content)
+              if (lcur->children && lcur->children->content)
                 {
                   char* lastChar = (char*)lcur->children->content;
                   while(*(lastChar+1) != '\0')
@@ -481,18 +475,16 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
                     {
                       *lastChar = '\0';
                     }
-                  vh->setSystemRoot((const char*)lcur->children->content);
+                  vh->setSystemRoot ((const char*)lcur->children->content);
                 }
               else
-                {
-                  vh->setSystemRoot("");
-                }
+                vh->setSystemRoot ("");
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ACCESSLOG"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"ACCESSLOG"))
             {
               loadXMLlogData ("ACCESSLOG", vh, lcur);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"WARNINGLOG"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"WARNINGLOG"))
             {
               loadXMLlogData ("WARNINGLOG", vh, lcur);
             }
@@ -503,11 +495,11 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
             }
           else if(!xmlStrcmp(lcur->name, (const xmlChar *)"THROTTLING_RATE"))
             {
-              vh->setThrottlingRate((u_long)atoi((char*)lcur->children->content));
+              vh->setThrottlingRate ((u_long)atoi((char*)lcur->children->content));
             }
 
           lcur = lcur->next;
-        }//while(lcur)
+        }// while(lcur)
       
       if (vh->openLogFiles ())
         {
@@ -518,9 +510,11 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
           continue;
         }
 
-      if ( vh->initializeSSL() < 0 )
+      if (vh->initializeSSL() < 0)
         {
-          errMsg.assign("Error: initializing vhost");
+          errMsg.assign ("Error: initializing vhost ");
+          errMsg.append (vh->getName ());
+          errMsg.assign (" : cannot initialize SSL. ");
           Server::getInstance()->logWriteln(errMsg.c_str(), MYSERVER_LOG_MSG_ERROR);
           delete vh;
           vh = 0;



commit 3c78cbe3f78cc7965876f5ab43a5f0fd098a57fd
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 20:00:26 2009 +0200

    Move Windows files in a separate directory.

diff --git a/myserver/binaries/NSIS installer script.nsi b/misc/wingen/NSIS installer script.nsi
similarity index 100%
rename from myserver/binaries/NSIS installer script.nsi
rename to misc/wingen/NSIS installer script.nsi
diff --git a/myserver/binaries/clean_copy.sh b/misc/wingen/clean_copy.sh
similarity index 100%
rename from myserver/binaries/clean_copy.sh
rename to misc/wingen/clean_copy.sh
diff --git a/myserver/generate_myserver_dev.pl b/misc/wingen/generate_myserver_dev.pl
similarity index 100%
rename from myserver/generate_myserver_dev.pl
rename to misc/wingen/generate_myserver_dev.pl
diff --git a/myserver/myserver.dev b/misc/wingen/myserver.dev
similarity index 100%
rename from myserver/myserver.dev
rename to misc/wingen/myserver.dev
diff --git a/myserver/binaries/myserver.ico b/misc/wingen/myserver.ico
similarity index 100%
rename from myserver/binaries/myserver.ico
rename to misc/wingen/myserver.ico
diff --git a/myserver/binaries/splash.bmp b/misc/wingen/splash.bmp
similarity index 100%
rename from myserver/binaries/splash.bmp
rename to misc/wingen/splash.bmp
diff --git a/myserver/binaries/uninstall.bmp b/misc/wingen/uninstall.bmp
similarity index 100%
rename from myserver/binaries/uninstall.bmp
rename to misc/wingen/uninstall.bmp
diff --git a/myserver/binaries/wizard.bmp b/misc/wingen/wizard.bmp
similarity index 100%
rename from myserver/binaries/wizard.bmp
rename to misc/wingen/wizard.bmp

-----------------------------------------------------------------------

Summary of changes:
 .../wingen}/NSIS installer script.nsi              |    0
 {myserver/binaries => misc/wingen}/clean_copy.sh   |    0
 {myserver => misc/wingen}/generate_myserver_dev.pl |    0
 {myserver => misc/wingen}/myserver.dev             |    0
 {myserver/binaries => misc/wingen}/myserver.ico    |  Bin 2238 -> 2238 bytes
 {myserver/binaries => misc/wingen}/splash.bmp      |  Bin 36214 -> 36214 bytes
 {myserver/binaries => misc/wingen}/uninstall.bmp   |  Bin 52574 -> 52574 bytes
 {myserver/binaries => misc/wingen}/wizard.bmp      |  Bin 154542 -> 154542 bytes
 myserver/src/base/ssl/ssl.cpp                      |   29 ++--
 myserver/src/conf/vhost/vhost_manager.cpp          |  146 ++++++++++----------
 10 files changed, 85 insertions(+), 90 deletions(-)
 rename {myserver/binaries => misc/wingen}/NSIS installer script.nsi (100%)
 rename {myserver/binaries => misc/wingen}/clean_copy.sh (100%)
 rename {myserver => misc/wingen}/generate_myserver_dev.pl (100%)
 rename {myserver => misc/wingen}/myserver.dev (100%)
 rename {myserver/binaries => misc/wingen}/myserver.ico (100%)
 rename {myserver/binaries => misc/wingen}/splash.bmp (100%)
 rename {myserver/binaries => misc/wingen}/uninstall.bmp (100%)
 rename {myserver/binaries => misc/wingen}/wizard.bmp (100%)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 15 15:21:47 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MRA31-0000IB-PD
	for mharc-myserver-commit@gnu.org; Wed, 15 Jul 2009 15:21:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MRA2z-0000HV-HF
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 15:21:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MRA2y-0000H0-Uy
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 15:21:45 -0400
Received: from [199.232.76.173] (port=39828 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MRA2y-0000Gk-LO
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 15:21:44 -0400
Received: from savannah.gnu.org ([199.232.41.3]:46017 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 1MRA2t-00057m-5u
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 15:21:43 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MRA2r-0006wC-Td
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 19:21:38 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MRA2q-0006v0-Sg
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 19:21:37 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 06b01dc7289a36b1e0b85147cb973c650d87d8f9
X-Git-Newrev: 592e52de4a224e39a737e6b564954855a658db58
Message-Id: <E1MRA2q-0006v0-Sg@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 15 Jul 2009 19:21:37 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 592e52de4a224e39a737e6b564954855a658db58
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: Wed, 15 Jul 2009 19:21:46 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  592e52de4a224e39a737e6b564954855a658db58 (commit)
       via  7b527a9f65daae08ad347b3b70a3458e80e15ef0 (commit)
       via  3565c08bbf7d2787efa45ce5a07a4cf042c6ef3e (commit)
      from  06b01dc7289a36b1e0b85147cb973c650d87d8f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 592e52de4a224e39a737e6b564954855a658db58
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 21:11:26 2009 +0200

    Use `SYSROOT' instead of `SYSFOLDER'.

diff --git a/myserver/binaries/virtualhosts.default.windows.xml b/myserver/binaries/virtualhosts.default.windows.xml
index 3d1897b..36b3b47 100755
--- a/myserver/binaries/virtualhosts.default.windows.xml
+++ b/myserver/binaries/virtualhosts.default.windows.xml
@@ -9,7 +9,7 @@
 		<PROTOCOL>HTTP</PROTOCOL>
 		
 		<DOCROOT>web</DOCROOT>
-		<SYSFOLDER>system</SYSFOLDER>
+		<SYSROOT>system</SYSROOT>
 
 		<ACCESSLOG>
                   <STREAM location="file://logs/MyServerHTTP.log" cycle="1048576"/>
@@ -27,7 +27,7 @@
 		<PROTOCOL>FTP</PROTOCOL>
 		
 		<DOCROOT>web</DOCROOT>
-		<SYSFOLDER>system</SYSFOLDER>
+		<SYSROOT>system</SYSROOT>
 		
 		<ACCESSLOG>
                   <STREAM location="file://logs/MyServerFTP.log" cycle="1048576"/>
diff --git a/myserver/binaries/virtualhosts.default.xml b/myserver/binaries/virtualhosts.default.xml
index 3d1897b..36b3b47 100755
--- a/myserver/binaries/virtualhosts.default.xml
+++ b/myserver/binaries/virtualhosts.default.xml
@@ -9,7 +9,7 @@
 		<PROTOCOL>HTTP</PROTOCOL>
 		
 		<DOCROOT>web</DOCROOT>
-		<SYSFOLDER>system</SYSFOLDER>
+		<SYSROOT>system</SYSROOT>
 
 		<ACCESSLOG>
                   <STREAM location="file://logs/MyServerHTTP.log" cycle="1048576"/>
@@ -27,7 +27,7 @@
 		<PROTOCOL>FTP</PROTOCOL>
 		
 		<DOCROOT>web</DOCROOT>
-		<SYSFOLDER>system</SYSFOLDER>
+		<SYSROOT>system</SYSROOT>
 		
 		<ACCESSLOG>
                   <STREAM location="file://logs/MyServerFTP.log" cycle="1048576"/>
diff --git a/myserver/documentation/ssl_certificates.texi b/myserver/documentation/ssl_certificates.texi
index 0bc0bf8..4b7ce11 100644
--- a/myserver/documentation/ssl_certificates.texi
+++ b/myserver/documentation/ssl_certificates.texi
@@ -49,7 +49,7 @@ the following lines in the @file{virtualhosts.xml} file:
   <SSL_CERTIFICATE>certificates/cert.pem</SSL_CERTIFICATE>
   <PROTOCOL>HTTPS</PROTOCOL>
   <DOCROOT>web</DOCROOT>
-  <SYSFOLDER>system</SYSFOLDER>
+  <SYSROOT>system</SYSROOT>
   <ACCESSLOG>logs/myServer.log</ACCESSLOG>
   <WARNINGLOG>logs/myServer.err</WARNINGLOG>
 </VHOST>
diff --git a/myserver/documentation/virtual_hosts.texi b/myserver/documentation/virtual_hosts.texi
index 42cc61f..51b2ebe 100644
--- a/myserver/documentation/virtual_hosts.texi
+++ b/myserver/documentation/virtual_hosts.texi
@@ -15,7 +15,7 @@ A sample virtual hosts configuration file looks like:
     <IP>192.168.0.0/24</IP>
     <PROTOCOL>HTTP</PROTOCOL>
     <DOCROOT>web</DOCROOT>
-    <SYSFOLDER>system</SYSFOLDER>
+    <SYSROOT>system</SYSROOT>
     <HOST>foo.bar.com</HOST>
     <ACCESSLOG>logs/myServer.log</ACCESSLOG>
     <WARNINGLOG>logs/myServer.err</WARNINGLOG>
@@ -39,7 +39,7 @@ host.
 it is the protocol used by the host.
 @item <DOCROOT>
 it is the directory where the files are found.
-@item <SYSFOLDER>
+@item <SYSROOT>
 it is the system directory.
 @item <HOST>
 it is your virtual host's name. The optional useRegex="YES"
@@ -74,7 +74,7 @@ Here is an example of a FTP virtual host:
     <IP>127.0.0.1/32</IP>
     <PROTOCOL>FTP</PROTOCOL>
     <DOCROOT>web</DOCROOT>
-    <SYSFOLDER>system</SYSFOLDER>
+    <SYSROOT>system</SYSROOT>
     <HOST>ftp.foo.bar.com</HOST>
     <ACCESSLOG>logs/myServer.log</ACCESSLOG>
     <WARNINGLOG>logs/myServer.err</WARNINGLOG>
diff --git a/myserver/src/conf/vhost/vhost_manager.cpp b/myserver/src/conf/vhost/vhost_manager.cpp
index 2dd9feb..46dcc36 100644
--- a/myserver/src/conf/vhost/vhost_manager.cpp
+++ b/myserver/src/conf/vhost/vhost_manager.cpp
@@ -462,7 +462,7 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
               else
                 vh->setDocumentRoot ("");
             }
-          else if (!xmlStrcmp(lcur->name, (const xmlChar *)"SYSFOLDER"))
+          else if (!xmlStrcmp(lcur->name, (const xmlChar *)"SYSROOT"))
             {
               if (lcur->children && lcur->children->content)
                 {



commit 7b527a9f65daae08ad347b3b70a3458e80e15ef0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 21:09:44 2009 +0200

    Removed duplicated files.

diff --git a/misc/control/control/Makefile.am b/misc/control/control/Makefile.am
deleted file mode 100644
index 537f2bc..0000000
--- a/misc/control/control/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-bin_PROGRAMS = myserver-configure 
-myserver_configure_SOURCES = control_client.cpp fltkconfig.cpp language.cpp mimetype.cpp\
-		 myserver-configure.cpp progress.cpp service.cpp vector.cpp vhost.cpp
-
-INCLUDES = $(all_includes)
-
-myserver_configure_LDFLAGS = $(all_libraries) 
-myserver_configure_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) $(FLTK_CFLAGS) -DPREFIX=\"$(prefix)\"
-myserver_configure_LDADD = ../src/libmyserver.a $(XML_LIBS) $(FLTK_LIBS) $(XNET_LIB) $(OPENSSL_LIB) $(LDFLAGS)
-
-EXTRA_DIST = control_client.h fltkconfig.h language.h mimetype.h progress.h service.h vector.h vhost.h
-
-all : all-am myserver-configure$(EXEEXT)
-	cp myserver-configure$(EXEEXT) ../binaries/
diff --git a/misc/control/control/MyServer Configure.dev b/misc/control/control/MyServer Configure.dev
deleted file mode 100644
index 1a82f5b..0000000
--- a/misc/control/control/MyServer Configure.dev	
+++ /dev/null
@@ -1,189 +0,0 @@
-[Project]
-FileName=MyServer Configure.dev
-Name=MyServer Configure
-UnitCount=9
-Type=0
-Ver=1
-ObjFiles=
-Includes=..;.
-Libs=
-PrivateResource=MyServer_Configure_private.rc
-ResourceIncludes=
-MakeIncludes=
-Compiler=-DWIN32_@@_
-CppCompiler=
-Linker=../src/securestr.o ../src/utility.o  ../src/safetime.o   ../src/thread.o  ../src/file.o ../src/ssl_socket.o   ../src/stringutils.o ../src/socket.o ../src/stream.o ../src/find_data.o ../src/xml_parser.o  ../src/mem_buff.o ../src/md5.o   ../src/files_utility.o -lfltk -lm -lz.dll -llibxml2 -liconv -lintl -lssl  -lcrypto -lwininet -lwsock32  -lole32  -luuid  _@@_
-IsCpp=1
-Icon=MyServer Configure.ico
-ExeOutput=..\binaries
-ObjectOutput=tmp
-OverrideOutput=0
-OverrideOutputName=myserver-configure.exe
-HostApplication=
-Folders=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=1
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000001000000000100
-
-[VersionInfo]
-Major=0
-Minor=9
-Release=0
-Build=3
-LanguageID=1033
-CharsetID=1252
-CompanyName=MyServer Project
-FileVersion=0.9.0
-FileDescription=MyServer Configuration Interface
-InternalName=
-LegalCopyright=MyServer Team
-LegalTrademarks=
-OriginalFilename=MyServer Configure.exe
-ProductName=MyServer
-ProductVersion=0.9.0
-AutoIncBuildNr=0
-
-[Unit2]
-FileName=language.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=service.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=progress.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=vhost.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=vector.h
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=vector.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=control_client.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=progress.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit1]
-FileName=fltkconfig.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=myserver-configure.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=mimetype.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=vhost.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=vector.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=control_client.cpp
-CompileCpp=1
-Folder=MyServer Configure
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/misc/control/control/MyServer Configure.ico b/misc/control/control/MyServer Configure.ico
deleted file mode 100644
index d7a0fa1..0000000
Binary files a/misc/control/control/MyServer Configure.ico and /dev/null differ
diff --git a/misc/control/control/bless.patch b/misc/control/control/bless.patch
deleted file mode 100644
index cc560dc..0000000
--- a/misc/control/control/bless.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fltkconfig.h.old	2007-04-05 20:31:23.000000000 +0200
-+++ fltkconfig.h	2007-04-05 20:31:57.000000000 +0200
-@@ -20,6 +20,18 @@
- #include <FL/Fl_Progress.H>
- #include <FL/Fl_Output.H>
- #include <FL/Fl_Counter.H>
-+#include <FL/Fl_File_Chooser.H>
-+#include <FL/fl_ask.H>
-+#include "../include/xml_parser.h"
-+#include "../include/stringutils.h"
-+#include "../include/md5.h"
-+#include "../include/utility.h"
-+#include "service.h"
-+#include "language.h"
-+#include "mimetype.h"
-+#include "vhost.h"
-+#include "control_client.h"
-+#include "progress.h"
- 
- class MainDlg {
- public:
diff --git a/misc/control/control/control_client.cpp b/misc/control/control/control_client.cpp
deleted file mode 100644
index 8113ee8..0000000
--- a/misc/control/control/control_client.cpp
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- 
- This library 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
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
-  */
-#include "control_client.h"
-
-//#define DEBUG
-/* Max read of header before failure */
-#define MAXHEADERLEN  2048
-/* Max wait time before failure */
-#define TIMEOUT       30000
-/* Buffer size.  Make smaller for more dramatic effect */
-#define BUFFSIZE      16
-
-ControlClient::ControlClient()
-{
-   clearCallback();
-   Connected = false;
-   Buffer.free();
-   UserName[0] = '\0';
-   memset(UserPass, 0, 64);
-   memset(LastCode, 0, 4);
-	 socket = 0;
-}
-
-ControlClient::~ControlClient()
-{
-   clearCallback();
-   memset(UserPass, 0, 64); // no memory snoops here
-   Buffer.free();
-   if(Connected)
-     socket->close();
-	 if(socket)
-		 delete socket;
-}
-
-void ControlClient::setCallback(ControlClientCallback callback, void * parm)
-{
-   Progress = callback;
-   Object = parm;
-}
-
-void ControlClient::clearCallback()
-{
-   Progress = NULL;
-   Object = NULL;
-}
-
-int ControlClient::Login(const char * address, const int port,
-			 const char * name, const char * pass)
-{
-   if(address == NULL || port == 0 || name == NULL || pass == NULL)
-     return -1;
-
-   if(Connected)
-     Logout();
-
-   MYSERVER_HOSTENT *hp = Socket::gethostbyname(address);
-   if(hp == NULL)
-     return -2;
-
-   int ret;
-	 Socket* tcpSocket = new SslSocket(tcpSocket);
-   struct sockaddr_in sockAddr;
-   int sockLen = sizeof(sockAddr);
-   memset(&sockAddr, 0, sizeof(sockAddr));
-   sockAddr.sin_family = AF_INET;
-   memcpy(&sockAddr.sin_addr, hp->h_addr, hp->h_length);
-   sockAddr.sin_port = htons(port);
-   
-   /*! Try to create the socket. */
-   if(tcpSocket->socket(AF_INET, SOCK_STREAM, 0) == -1)
-     {
-       delete tcpSocket;
-       return -2;
-     }
-
-
-   /*! If the socket was created try to connect. */
-   if(tcpSocket->connect((MYSERVER_SOCKADDR*)&sockAddr, sockLen) == -1)
-     {
-       socket->close();
-       delete tcpSocket;
-       return -2;
-     }
-
-	 socket = tcpSocket;
-
-   Connected = true;
-
-   // Socket connected, test if we are authorized
-   strncpy(UserName, name, 64);
-   strncpy(UserPass, pass, 64);
-   ret = sendRequest("VERSION", "");
-   if(ret) // bad thing happend
-     {
-	Logout();
-	return -3;
-     }
-   ret = getResponse();
-   if(ret)
-     {
-	Logout();
-	if(ret == -1)
-	  return -3;
-	return ret;
-     }
-
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::Logout()
-{
-   memset(UserPass, 0, 64); // no memory snoops here
-   Buffer.setLength(0);
-   if(Connected)
-     socket->close();
-   Connected = false;
-   return 0;
-}
-
-int ControlClient::getVersion(MemBuf & data)
-{
-   int ret;
-   ret = sendRequest("VERSION", "");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   if(DataPos == -1)
-     return -1;
-   Buffer.getPart(DataPos, Buffer.getLength(), data);
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::sendReboot()
-{
-   int ret;
-   ret = sendRequest("REBOOT", "");
-   if(ret)
-     return -1;
-   return 0;
-}
-
-int ControlClient::getMyserverConf(MemBuf & data)
-{
-   int ret;
-   ret = sendRequest("GETFILE", "myserver.xml");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   if(DataPos == -1)
-     return -1;
-   Buffer.getPart(DataPos, Buffer.getLength(), data);
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::getVhostsConf(MemBuf & data)
-{
-   int ret;
-   ret = sendRequest("GETFILE", "virtualhosts.xml");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   if(DataPos == -1)
-     return -1;
-   Buffer.getPart(DataPos, Buffer.getLength(), data);
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::getMIMEtypesConf(MemBuf & data)
-{
-   int ret;
-   ret = sendRequest("GETFILE", "MIMEtypes.xml");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   if(DataPos == -1)
-     return -1;
-   Buffer.getPart(DataPos, Buffer.getLength(), data);
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::sendMyserverConf(MemBuf & data)
-{
-   int ret;
-   ret = sendRequest("PUTFILE", "myserver.xml", data);
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::sendVhostsConf(MemBuf & data)
-{
-   int ret;
-   ret = sendRequest("PUTFILE", "virtualhosts.xml", data);
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::sendMIMEtypesConf(MemBuf & data)
-{
-   int ret;
-   ret = sendRequest("PUTFILE", "MIMEtypes.xml", data);
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::getLanguages(Vector & list)
-{
-   int ret;
-   ret = sendRequest("SHOWLANGUAGEFILES", "");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   if(DataPos == -1)
-     return -1;
-   /* Warning: this is destructive to Buffer */
-   list.clear();
-   int i, len;
-   char * chrptr = &Buffer[DataPos];
-   len = Buffer.getLength();
-   for(i = DataPos; i < len; i++) // slow but not critical
-     {
-	if(Buffer[i] == '\r')
-	  {
-	     Buffer[i] = '\0';
-	     list.add(chrptr);
-	     chrptr = &Buffer[i] + 2; // avoid error checking
-	  } // if
-     } // for
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::getDynamicProtocols(Vector & list)
-{
-   int ret;
-   ret = sendRequest("SHOWDYNAMICPROTOCOLS", "");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   list.clear();
-   if(DataPos == -1)
-     return 0; // empty list
-   /* Warning: this is destructive to Buffer */
-   int i, len;
-   char * chrptr = &Buffer[DataPos];
-   len = Buffer.getLength();
-   for(i = DataPos; i < len; i++) // slow but not critical
-     {
-	if(Buffer[i] == '\r')
-	  {
-	     Buffer[i] = '\0';
-	     list.add(chrptr);
-	     chrptr = &Buffer[i] + 2; // avoid error checking
-	  } // if
-     } // for
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::getConnections(Vector & list)
-{
-   int ret;
-   ret = sendRequest("SHOWCONNECTIONS", "");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   list.clear();
-   if(DataPos == -1)
-     return 0; // empty list
-   /* Warning: this is destructive to Buffer */
-   int i, len;
-   char * chrptr = &Buffer[DataPos];
-   len = Buffer.getLength();
-   for(i = DataPos; i < len; i++) // slow but not critical
-     {
-	if(Buffer[i] == '\r')
-	  {
-	     Buffer[i] = '\0';
-	     list.add(chrptr);
-	     chrptr = &Buffer[i] + 2; // avoid error checking
-	  } // if
-     } // for
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::sendKillConnection(VectorNode * node)
-{
-   char * chrptr = (char *)memchr(node->Text, '-', strlen(node->Text));
-   if(chrptr == NULL)
-     return -1;
-   int len = (int)(chrptr - node->Text);
-   char id[len];
-   memcpy(id, node->Text, len);
-   id[len] = '\0';
-   int ret;
-   ret = sendRequest("KILLCONNECTION", id);
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   Buffer.setLength(0);
-   return 0;
-}
-
-int ControlClient::sendDisableReboot()
-{
-   int ret;
-   ret = sendRequest("DISABLEREBOOT", "");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   return 0;
-}
-
-int ControlClient::sendEnableReboot()
-{
-   int ret;
-   ret = sendRequest("ENABLEREBOOT", "");
-   if(ret)
-     return -1;
-   ret = getResponse();
-   if(ret)
-     return ret;
-   return 0;
-}
-
-int ControlClient::sendRequest(const char * cmd, const char * opt)
-{
-   memset(LastCode, 0, 4);
-   if(!Connected)
-     return -1;
-
-   int ret;
-   Buffer.setLength(0);
-   Buffer << "/" << cmd << " CONTROL/1.0 " << opt << "\r\n";
-   Buffer << "/CONNECTION Keep-Alive\r\n";
-   Buffer << "/LEN 0\r\n";
-   Buffer << "/AUTH " << UserName << ":" << UserPass << "\r\n";
-   Buffer << "\r\n";
-   ret = socket->send((const char *)Buffer.getBuffer(), Buffer.getLength(), 0);
-#ifdef DEBUG
-   write(1, (const char *)Buffer.getBuffer(), Buffer.getLength());
-#endif   
-   Buffer.setLength(0);
-   return (ret == -1 ? -1 : 0);
-}
-
-int ControlClient::sendRequest(const char * cmd, const char * opt, MemBuf & data)
-{
-   memset(LastCode, 0, 4);
-   if(!Connected)
-     return -1;
-   MemBuf tmp;
-   int ret1, ret2;
-   int len, pos;
-   int bytes;
-   tmp.intToStr(data.getLength());
-   Buffer.setLength(0);
-   Buffer << "/" << cmd << " CONTROL/1.0 " << opt << "\r\n";
-   Buffer << "/CONNECTION Keep-Alive\r\n";
-   Buffer << "/LEN " << tmp << "\r\n";
-   Buffer << "/AUTH " << UserName << ":" << UserPass << "\r\n";
-   Buffer << "\r\n";
-   ret1 = socket->send((const char *)Buffer.getBuffer(), Buffer.getLength(), 0);
-#ifdef DEBUG
-   write(1, (const char *)Buffer.getBuffer(), Buffer.getLength());
-#endif
-   // send small chuncks for some user feedback
-   len = data.getLength();
-   pos = 0;
-   while(pos < len)
-     {
-	bytes = (len - pos < BUFFSIZE ? len - pos : BUFFSIZE);
-	ret2 = socket->send((const char *)&data[pos], bytes, 0);
-	if(ret2 == -1)
-	  break;
-	pos += ret2;
-	// callback function
-	if(Progress)
-	  Progress(Object, len, pos);
-     }
-   Buffer.setLength(0);
-#ifdef DEBUG
-   if(ret1 == -1)
-     write(1, "ret1 is -1\n", strlen("ret1 is -1\n"));
-   if(ret2 == -1)
-     write(1, "ret2 is -1\n", strlen("ret2 is -1\n"));
-#endif
-   return (ret1 == -1 || ret2 == -1 ? -1 : 0);
-}
-
-/*!
- * Try to receive data from the server.
- * Returns -1 on errors.
- * Returns 1 if there are not bytes to read.
- * Returns 2 if the header is incomplete.
- * Returns 3 on auth not valid.
- * Returns 0 on success.
- */
-int ControlClient::getResponse()
-{
-   if(!Connected)
-     return -1;
-//   if(!socket->bytesToRead())
-//     return  1;
-
-   int ret = 0;
-   int hLen = 0;
-   int returnLEN = 0;
-   char cBuffer[BUFFSIZE];
-   Buffer.setLength(0);
-#ifdef DEBUG
-   write(1, "Find header:", strlen("Find header:"));
-#endif
-   while(Buffer.find("\r\n\r\n", 4, 0) == (u_int)-1) // a little costly, may change
-     {
-	ret = socket->recv(cBuffer, BUFFSIZE, 0, TIMEOUT);
-
-	if(ret == -1)
-	  {
-	     HeaderGetReturn(); // get the code if any
-	     return -1;
-	  }
-
-	Buffer.addBuffer((const void *)cBuffer, ret);
-	
-	if(Buffer.getLength() > MAXHEADERLEN)
-	  {
-	     HeaderGetReturn(); // get the code if any
-	     return -1;
-	  }
-#ifdef DEBUG
-	write(1, cBuffer, ret);
-#endif
-     }
-
-#ifdef DEBUG
-   write(1, "\nDone\n", strlen("\nDone\n"));
-#endif
-   
-   // get header len
-   hLen = Buffer.find("\r\n\r\n", 4, 0) + 4;
-
-   // process the header
-   ret = HeaderGetReturn();
-
-   if(ret != CONTROL_OK)
-     {
-	if(ret == -1)
-	  return 2;
-	else if(ret == CONTROL_AUTH)
-	  return 3;
-	else
-	  {
-#ifdef DEBUG
-	     write(1, "HeaderGetReturn is -1\n", strlen("HeaderGetReturn is -1\n"));
-#endif
-	     return -1;
-	  }
-     }
-
-   returnLEN = HeaderGetLEN();
-   
-   if(returnLEN == -1)
-     return -1;
-
-   if(returnLEN > 0)  // we have data so get it
-     {
-#ifdef DEBUG
-	write(1, "Get data:", strlen("Get data:"));
-#endif
-	DataPos = hLen;
-	while(Buffer.getLength() < (u_int)(hLen + returnLEN))
-	  {
-	     ret = socket->recv(cBuffer, BUFFSIZE, 0, TIMEOUT);
-
-	     if(ret == -1)
-	       return -1;  // problem here
-#ifdef DEBUG
-	     write(1, cBuffer, ret);
-#endif
-	     Buffer.addBuffer((const void *)cBuffer, ret);
-	     
-	     // Callback function
-	     if(Progress)
-	       Progress(Object, returnLEN, Buffer.getLength() - hLen); 
-	  } // while
-#ifdef DEBUG
-   write(1, "\nDone\n", strlen("\nDone\n"));
-#endif
-     } // if
-   else
-     DataPos = -1; // no data
-
-   return 0; // A-OK
-}
-
-int ControlClient::HeaderGetReturn()
-{
-   int pos = Buffer.find('/');
-   int end = pos;
-   int len = Buffer.getLength();
-   int ret;
-   
-   if(pos == -1)
-     return -1;
-   
-   while(Buffer[end] != '\r')
-     {
-	end++;
-	if(end > len)
-	  return -1;
-     }
-   
-   char temp[end - pos];
-   memcpy(temp, &Buffer.getAt(pos), end - pos);
-   temp[end - pos] = '\0';
-   
-   ret = atoi(&temp[1]);
-   
-   strncpy(LastCode, &temp[1], 4);
-   
-   return ret;
-}
-
-int ControlClient::HeaderGetLEN()
-{
-   int pos = Buffer.find((const void *)"/LEN", 4);
-   int end = pos;
-   int len = Buffer.getLength();
-   
-   if(pos == -1)
-     return -1;
-   
-   while(Buffer[end] != '\r')
-     {  
-	end++;
-	if(end > len)
-	  return -1;
-     }
-   
-   char temp[end - pos];
-   memcpy(temp, &Buffer.getAt(pos), end - pos);
-   temp[end - pos] = '\0';
-   
-   return atoi(&temp[4]);
-}
-
-   
diff --git a/misc/control/control/control_client.h b/misc/control/control/control_client.h
deleted file mode 100644
index dd6da6d..0000000
--- a/misc/control/control/control_client.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- 
- This library 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
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
-  */
-#ifndef CONTROL_CLIENT_H
-#define CONTROL_CLIENT_H
-
-#include <include/base/socket/socket.h>
-#include <include/base/socket/ssl_socket.h>
-#include <include/base/file/file.h>
-#include <include/protocol/control/control_errors.h>
-#include <include/base/string/stringutils.h>
-#include <include/base/mem_buff/mem_buff.h>
-
-#include "vector.h"
-
-typedef void (*ControlClientCallback)(void *, unsigned int, unsigned int);
-
-class ControlClient
-{
- public:
-   ControlClient();
-   ~ControlClient();
-   
-   void setCallback(ControlClientCallback, void *);
-   void clearCallback();
-   
-   int Login(const char *, const int, const char *, const char *);
-   int Logout();
-   
-   int getVersion(MemBuf &);
-   int sendReboot();
-   
-   int getMyserverConf(MemBuf &);
-   int getVhostsConf(MemBuf &);
-   int getMIMEtypesConf(MemBuf &);
-   
-   int sendMyserverConf(MemBuf &);
-   int sendVhostsConf(MemBuf &);
-   int sendMIMEtypesConf(MemBuf &);
-   
-   int getLanguages(Vector &);
-   int getDynamicProtocols(Vector &);
-   
-   int getConnections(Vector &);
-   int sendKillConnection(VectorNode *);
-
-   int sendDisableReboot();
-   int sendEnableReboot();
-   
-   char LastCode[4];
- protected:
-   int sendRequest(const char *, const char *);
-   int sendRequest(const char *, const char *, MemBuf &);
-   int getResponse();
-   Socket* socket;
-   bool Connected;
-   MemBuf Buffer;
-   int DataPos;
- private:
-   int HeaderGetReturn();
-   int HeaderGetLEN();
-   ControlClientCallback Progress;
-   void * Object;
-   char UserName[64];
-   char UserPass[64];
-};
-
-#endif
diff --git a/misc/control/control/fltkconfig.cpp b/misc/control/control/fltkconfig.cpp
deleted file mode 100644
index 9b3eb9a..0000000
--- a/misc/control/control/fltkconfig.cpp
+++ /dev/null
@@ -1,5033 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0108
-
-#include "language.h"
-#include "fltkconfig.h"
-
-void MainDlg::cb_ConfDlg_i(Fl_Double_Window*, void*) {
-  if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-    ConfDlg->hide();
-  }
-}
-else {
-  ConfDlg->hide();
-};
-}
-void MainDlg::cb_ConfDlg(Fl_Double_Window* o, void* v) {
-  ((MainDlg*)(o->user_data()))->cb_ConfDlg_i(o,v);
-}
-
-void MainDlg::cb_Open_i(Fl_Menu_*, void*) {
-  int ret;
-if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-    ret = ask_type();
-    if(ret == -1) {
-      ret = 0;
-    }
-    else {
-      ConfType = ret;
-      ret = load_config();
-    }
-  }
-}
-else {
-  ret = ask_type();
-  if(ret == -1) {
-    ret = 0;
-  }
-  else {
-    ConfType = ret;
-    ret = load_config();
-  }
-}
-
-if(ret) {
-  fl_alert(LanguageXMLNot_Found);
-};
-}
-void MainDlg::cb_Open(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Open_i(o,v);
-}
-
-void MainDlg::cb_Save_i(Fl_Menu_*, void*) {
-  int i = ask_type();
-if(i != -1) {
-  ConfType = i;
-  i = save_config();
-  if(i) {
-    fl_alert(LanguageXMLNot_Save);
-  }
-};
-}
-void MainDlg::cb_Save(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Save_i(o,v);
-}
-
-void MainDlg::cb_Revert_i(Fl_Menu_*, void*) {
-  if(fl_choice(LanguageXMLReload_Prev, LanguageXMLNo, LanguageXMLYes, NULL)) {
-  load_config();
-};
-}
-void MainDlg::cb_Revert(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Revert_i(o,v);
-}
-
-void MainDlg::cb_as_i(Fl_Menu_*, void*) {
-  RunAsConsole();
-}
-void MainDlg::cb_as(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_as_i(o,v);
-}
-
-void MainDlg::cb_as1_i(Fl_Menu_*, void*) {
-  RunAsService();
-}
-void MainDlg::cb_as1(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_as1_i(o,v);
-}
-
-void MainDlg::cb_Console_i(Fl_Menu_*, void*) {
-  StopConsole();
-}
-void MainDlg::cb_Console(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Console_i(o,v);
-}
-
-void MainDlg::cb_Service_i(Fl_Menu_*, void*) {
-  StopService();
-}
-void MainDlg::cb_Service(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Service_i(o,v);
-}
-
-void MainDlg::cb_Quit_i(Fl_Menu_*, void*) {
-  if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-    ConfDlg->hide();
-  }
-}
-else {
-  ConfDlg->hide();
-};
-}
-void MainDlg::cb_Quit(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Quit_i(o,v);
-}
-
-void MainDlg::cb_Install_i(Fl_Menu_*, void*) {
-  InstallService();
-}
-void MainDlg::cb_Install(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Install_i(o,v);
-}
-
-void MainDlg::cb_Remove_i(Fl_Menu_*, void*) {
-  RemoveService();
-}
-void MainDlg::cb_Remove(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Remove_i(o,v);
-}
-
-void MainDlg::cb_Login_i(Fl_Menu_*, void*) {
-  ServerLogin(true);
-}
-void MainDlg::cb_Login(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_Login_i(o,v);
-}
-
-void MainDlg::cb_MenuLogout_i(Fl_Menu_*, void*) {
-  ServerLogout();
-}
-void MainDlg::cb_MenuLogout(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_MenuLogout_i(o,v);
-}
-
-void MainDlg::cb_MenuGetConfig_i(Fl_Menu_*, void*) {
-  int ret;
-if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-
-    ret = load_config_remote();
-
-    if(ret) {
-      ret = ServerLogin(false);
-      if(!ret) {
-        ret = load_config_remote();
-      }
-    }
-
-    if(ret == -1) {
-      fl_alertcat(LanguageXMLDownload_Failed, Server.LastCode);
-      ServerLogout();
-    }
-    else if(ret) {
-      fl_alert(LanguageXMLNot_Found);
-    }
-  }
-}
-else {
-
-  ret = load_config_remote();
-
-  if(ret) {
-    ret = ServerLogin(false);
-    if(!ret) {
-      ret = load_config_remote();   
-    }
-  }
-
-  if(ret == -1) {
-    fl_alertcat(LanguageXMLDownload_Failed, Server.LastCode);
-    ServerLogout();
-  }
-  else if(ret) {
-    fl_alert(LanguageXMLNot_Found);
-  }
-};
-}
-void MainDlg::cb_MenuGetConfig(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_MenuGetConfig_i(o,v);
-}
-
-void MainDlg::cb_MenuSendConfig_i(Fl_Menu_*, void*) {
-  int ret;
-ret = fl_choice(LanguageXMLKill_All, LanguageXMLNo, LanguageXMLYes, NULL);
-if(ret) {
-
-  ret = save_config_remote();
-
-  if(ret) {
-    ret = ServerLogin(false);
-    if(!ret) {
-      ret = save_config_remote();
-    }
-  }
-
-  if(ret == -1) {
-    fl_alertcat(LanguageXMLUpload_Failed, Server.LastCode);
-  }
-  else if(ret) {
-    fl_alert(LanguageXMLNot_Save);
-  }
-}
-ServerLogout();
-}
-void MainDlg::cb_MenuSendConfig(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_MenuSendConfig_i(o,v);
-}
-
-void MainDlg::cb_MenuConnections_i(Fl_Menu_*, void*) {
-  ServerConnections();
-}
-void MainDlg::cb_MenuConnections(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_MenuConnections_i(o,v);
-}
-
-void MainDlg::cb_MenuReboot_i(Fl_Menu_*, void*) {
-  int ret;
-ret = fl_choice(LanguageXMLKill_All, LanguageXMLNo, LanguageXMLYes, NULL);
-if(ret) {
-  ret = Server.sendReboot();
-  
-  if(ret) {
-    ret = ServerLogin(false);
-    if(!ret) {
-      ret = Server.sendReboot();
-    }
-  }
-
-  if(ret) {
-    fl_alert(LanguageXMLReboot_Failed);
-  }
-
-  ServerLogout();
-};
-}
-void MainDlg::cb_MenuReboot(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_MenuReboot_i(o,v);
-}
-
-void MainDlg::cb_About_i(Fl_Menu_*, void*) {
-  AboutDlg->show();
-}
-void MainDlg::cb_About(Fl_Menu_* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_About_i(o,v);
-}
-
-Fl_Menu_Item MainDlg::menu_[] = {
- {ctrl_gettext("&File"), 0,  0, 0, 64, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("&Open..."), 0,  (Fl_Callback*)MainDlg::cb_Open, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("&Save..."), 0,  (Fl_Callback*)MainDlg::cb_Save, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("&Revert"), 0,  (Fl_Callback*)MainDlg::cb_Revert, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run"), 0,  0, 0, 64, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("as Console"), 0,  (Fl_Callback*)MainDlg::cb_as, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("as Service"), 0,  (Fl_Callback*)MainDlg::cb_as1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0},
- {ctrl_gettext("Stop"), 0,  0, 0, 64, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Console"), 0,  (Fl_Callback*)MainDlg::cb_Console, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Service"), 0,  (Fl_Callback*)MainDlg::cb_Service, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0},
- {ctrl_gettext("&Quit"), 0,  (Fl_Callback*)MainDlg::cb_Quit, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0},
- {ctrl_gettext("Ser&vice"), 0,  0, 0, 64, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Install Service"), 0,  (Fl_Callback*)MainDlg::cb_Install, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Remove Service"), 0,  (Fl_Callback*)MainDlg::cb_Remove, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0},
- {ctrl_gettext("Re&mote"), 0,  0, 0, 64, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Login..."), 0,  (Fl_Callback*)MainDlg::cb_Login, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Logout"), 0,  (Fl_Callback*)MainDlg::cb_MenuLogout, 0, 1, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Get Config"), 0,  (Fl_Callback*)MainDlg::cb_MenuGetConfig, 0, 1, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Send Config"), 0,  (Fl_Callback*)MainDlg::cb_MenuSendConfig, 0, 1, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Connections..."), 0,  (Fl_Callback*)MainDlg::cb_MenuConnections, 0, 1, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Reboot..."), 0,  (Fl_Callback*)MainDlg::cb_MenuReboot, 0, 1, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0},
- {ctrl_gettext("&Help"), 0,  0, 0, 64, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("&About"), 0,  (Fl_Callback*)MainDlg::cb_About, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0},
- {0,0,0,0,0,0,0,0,0}
-};
-Fl_Menu_Item* MainDlg::MenuLogout = MainDlg::menu_ + 20;
-Fl_Menu_Item* MainDlg::MenuGetConfig = MainDlg::menu_ + 21;
-Fl_Menu_Item* MainDlg::MenuSendConfig = MainDlg::menu_ + 22;
-Fl_Menu_Item* MainDlg::MenuConnections = MainDlg::menu_ + 23;
-Fl_Menu_Item* MainDlg::MenuReboot = MainDlg::menu_ + 24;
-
-void MainDlg::cb_Buffer_Size_i(Fl_Value_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Buffer_Size(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Buffer_Size_i(o,v);
-}
-
-void MainDlg::cb_Verbosity_i(Fl_Choice*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Verbosity(Fl_Choice* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Verbosity_i(o,v);
-}
-
-Fl_Menu_Item MainDlg::menu_Verbosity[] = {
- {ctrl_gettext("None"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Normal"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Higher"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Highest"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
-};
-
-void MainDlg::cb_Max_Log_File_Size_i(Fl_Value_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Max_Log_File_Size(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Max_Log_File_Size_i(o,v);
-}
-
-void MainDlg::cb_Nthreads_Static_i(Fl_Value_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Nthreads_Static(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Nthreads_Static_i(o,v);
-}
-
-void MainDlg::cb_Nthreads_Max_i(Fl_Value_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Nthreads_Max(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Nthreads_Max_i(o,v);
-}
-
-void MainDlg::cb_Language_i(Fl_Choice*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Language(Fl_Choice* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Language_i(o,v);
-}
-
-void MainDlg::cb_Connection_Timeout_i(Fl_Value_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Connection_Timeout(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Connection_Timeout_i(o,v);
-}
-
-void MainDlg::cb_Max_Connections_i(Fl_Value_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Max_Connections(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Max_Connections_i(o,v);
-}
-
-void MainDlg::cb_Gzip_Threshold_i(Fl_Value_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Gzip_Threshold(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Gzip_Threshold_i(o,v);
-}
-
-void MainDlg::cb_Browsefolder_Css_i(Fl_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Browsefolder_Css(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Browsefolder_Css_i(o,v);
-}
-
-void MainDlg::cb_Browse_i(Fl_Button*, void*) {
-  char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  Changed = true;
-  Browsefolder_Css->value(chrptr);
-};
-}
-void MainDlg::cb_Browse(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Browse_i(o,v);
-}
-
-void MainDlg::cb_Use_Errors_Files_i(Fl_Check_Button*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Use_Errors_Files(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Use_Errors_Files_i(o,v);
-}
-
-void MainDlg::cb_Add_i(Fl_Button*, void*) {
-  char * val;
-val = (char *)fl_input(LanguageXMLEnter_Default);
-if(val != 0) {
-  Changed = true;
-  Default_Filename->add(val);
-};
-}
-void MainDlg::cb_Add(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Add_i(o,v);
-}
-
-void MainDlg::cb_Remove1_i(Fl_Button*, void*) {
-  if(Default_Filename->value() != 0) {
-  Changed = true;
-  Default_Filename->remove(Default_Filename->value());
-};
-}
-void MainDlg::cb_Remove1(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Remove1_i(o,v);
-}
-
-void MainDlg::cb_Ext_i(Fl_Browser*, void*) {
-  int val = Ext->value();
-if(val != 0) {
-  val -= 1;
-  
-  Cmd->value(MimeConf.getCmd(val));
-  
-  if(Cmd->value() >= 2 && Cmd->value() <= 4) {
-  }
-
-  Mime->value(MimeConf.getType(val));
-
-  Manager->value(MimeConf.getManager(val));
-};
-}
-void MainDlg::cb_Ext(Fl_Browser* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Ext_i(o,v);
-}
-
-void MainDlg::cb_Add1_i(Fl_Button*, void*) {
-  char * val;
-int i;
-val = (char *)fl_input(LanguageXMLEnter_Extension);
-if(val != 0) {
-  Changed = true;
-  i = MimeConf.addExt(val);
-  MimeConf.populateExt(Ext);
-  Ext->value(i + 1);
-
-  Cmd->value(MimeConf.getCmd(i));
-  
-  
-  Mime->value(MimeConf.getType(i));
-
-  Manager->value(MimeConf.getManager(i));
-};
-}
-void MainDlg::cb_Add1(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Add1_i(o,v);
-}
-
-void MainDlg::cb_Remove2_i(Fl_Button*, void*) {
-  int val;
-val = Ext->value();
-if(val != 0) {
-  Changed = true;
-  val--;
-  MimeConf.removeExt(val);
-  MimeConf.populateExt(Ext);
-};
-}
-void MainDlg::cb_Remove2(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Remove2_i(o,v);
-}
-
-void MainDlg::cb_Mime_i(Fl_Choice*, void*) {
-  int val = Ext->value();
-if(val != 0) {
-  val--;
-  Changed = true;
-  MimeConf.setType(val, Mime->value());
-};
-}
-void MainDlg::cb_Mime(Fl_Choice* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Mime_i(o,v);
-}
-
-void MainDlg::cb_Add2_i(Fl_Button*, void*) {
-  char * val;
-int i, ret;
-val = (char *)fl_input(LanguageXMLEnter_MIME);
-if(val != 0) {
-  Changed = true;
-  i = MimeConf.addMime(val);
-  MimeConf.populateMime(Mime);
-  Mime->value(i);
-  ret = Ext->value();
-  if(ret != 0) {
-    ret--;
-    MimeConf.setType(ret, i);
-  }
-};
-}
-void MainDlg::cb_Add2(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Add2_i(o,v);
-}
-
-void MainDlg::cb_Cmd_i(Fl_Choice*, void*) {
-  int val = Cmd->value();
-int val2 = Ext->value();
-if(val >= 2 && val <= 4) {
-}
-else {
-  if(val2 != 0)
-    MimeConf.setManager(val2 - 1, NONE);
-  Manager->value(NONE);
-}
-
-if(val2 != 0) {
-  val2--;
-  MimeConf.setCmd(val2, val);
-  Changed = true;
-};
-}
-void MainDlg::cb_Cmd(Fl_Choice* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Cmd_i(o,v);
-}
-
-Fl_Menu_Item MainDlg::menu_Cmd[] = {
- {ctrl_gettext("Send the file"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("URL link"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run as CGI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run as FastCGI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run as SCGI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run as ISAPI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run as MSCGI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run as WINCGI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Execute"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Execute as an ISAPI module"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Execute self contained FastCGI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("Run self contained SCGI"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
-};
-
-void MainDlg::cb_Manager_i(Fl_Input*, void*) {
-  int val = Ext->value();
-if(val != 0) {
-  val--;
-  MimeConf.setManager(val, Manager->value());
-  Changed = true;
-};
-}
-void MainDlg::cb_Manager(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Manager_i(o,v);
-}
-
-void MainDlg::cb_ManagerButton_i(Fl_Button*, void*) {
-  int val = Ext->value();
-char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  if(val != 0) {
-    val--;
-    MimeConf.setManager(val, chrptr);
-    Manager->value(chrptr);
-    Changed = true;
-  }
-};
-}
-void MainDlg::cb_ManagerButton(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_ManagerButton_i(o,v);
-}
-
-void MainDlg::cb_Name_i(Fl_Choice*, void*) {
-  int i = Name->value();
-VHostConf.populateHost(i, Host);
-VHostConf.populateIp(i, Ip);
-Port->value(VHostConf.getPort(i));
-Protocol->value(VHostConf.getProtocol(i));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(i));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(i));
-Ssl_Password->value(VHostConf.getSsl_Password(i));
-Docroot->value(VHostConf.getDocroot(i));
-Sysfolder->value(VHostConf.getSysfolder(i));
-Accesseslog->value(VHostConf.getAccesseslog(i));
-Warninglog->value(VHostConf.getWarninglog(i));
-Allow_CGI->value(VHostConf.getService(i, ALLOW_CGI));
-Allow_ISAPI->value(VHostConf.getService(i, ALLOW_ISAPI));
-Allow_MSCGI->value(VHostConf.getService(i, ALLOW_MSCGI));
-Allow_WINCGI->value(VHostConf.getService(i, ALLOW_WINCGI));
-Allow_FASTCGI->value(VHostConf.getService(i, ALLOW_FASTCGI));
-Allow_SCGI->value(VHostConf.getService(i, ALLOW_SCGI));
-Allow_SEND_LINK->value(VHostConf.getService(i, ALLOW_SEND_LINK));
-Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(i, ALLOW_EXTERNAL_COMMANDS));
-Allow_SEND_FILE->value(VHostConf.getService(i, ALLOW_SEND_FILE));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-};
-}
-void MainDlg::cb_Name(Fl_Choice* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Name_i(o,v);
-}
-
-void MainDlg::cb_Add3_i(Fl_Button*, void*) {
-  char * val;
-int i;
-val = (char *)fl_input(LanguageXMLEnter_Name);
-if(val != 0) {
-  Changed = true;
-  i = VHostConf.addName(val);
-  VHostConf.populateName(Name);
-  Name->value(i);
-  VHostConf.populateHost(i, Host);
-  VHostConf.populateIp(i, Ip);
-  Port->value(VHostConf.getPort(i));
-  Protocol->value(VHostConf.getProtocol(i));
-  Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(i));
-  Ssl_Certificate->value(VHostConf.getSsl_Certificate(i));
-  Ssl_Password->value(VHostConf.getSsl_Password(i));
-  Docroot->value(VHostConf.getDocroot(i));
-  Sysfolder->value(VHostConf.getSysfolder(i));
-  Accesseslog->value(VHostConf.getAccesseslog(i));
-  Warninglog->value(VHostConf.getWarninglog(i));
-  Allow_CGI->value(VHostConf.getService(i, ALLOW_CGI));
-  Allow_ISAPI->value(VHostConf.getService(i, ALLOW_ISAPI));
-  Allow_MSCGI->value(VHostConf.getService(i, ALLOW_MSCGI));
-  Allow_WINCGI->value(VHostConf.getService(i, ALLOW_WINCGI));
-  Allow_FASTCGI->value(VHostConf.getService(i, ALLOW_FASTCGI));
-  Allow_SCGI->value(VHostConf.getService(i, ALLOW_SCGI));
-  Allow_SEND_LINK->value(VHostConf.getService(i, ALLOW_SEND_LINK));
-  Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(i, ALLOW_EXTERNAL_COMMANDS));
-  Allow_SEND_FILE->value(VHostConf.getService(i, ALLOW_SEND_FILE));
-  i = Protocol->value();
-  if(i != 1 && i != 3) {
-    Ssl_Privatekey->deactivate();
-    Ssl_Certificate->deactivate();
-    Ssl_Password->deactivate();
-    SslButton1->deactivate();
-    SslButton2->deactivate();
-  }
-  else {
-    Ssl_Privatekey->activate();
-    Ssl_Certificate->activate();
-    Ssl_Password->activate();
-    SslButton1->activate();
-    SslButton2->activate();
-  }
-};
-}
-void MainDlg::cb_Add3(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Add3_i(o,v);
-}
-
-void MainDlg::cb_Remove3_i(Fl_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.removeName(i);
-i = 0;
-VHostConf.populateName(Name);
-Name->value(i);
-VHostConf.populateHost(i, Host);
-VHostConf.populateIp(i, Ip);
-Port->value(VHostConf.getPort(i));
-Protocol->value(VHostConf.getProtocol(i));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(i));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(i));
-Ssl_Password->value(VHostConf.getSsl_Password(i));
-Docroot->value(VHostConf.getDocroot(i));
-Sysfolder->value(VHostConf.getSysfolder(i));
-Accesseslog->value(VHostConf.getAccesseslog(i));
-Warninglog->value(VHostConf.getWarninglog(i));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-};
-}
-void MainDlg::cb_Remove3(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->user_data()))->cb_Remove3_i(o,v);
-}
-
-void MainDlg::cb_Protocol_i(Fl_Choice*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setProtocol(i, Protocol->value());
-int pval = Protocol->value();
-if(pval != 1 && pval != 3) {
-  VHostConf.setSsl_Privatekey(i, EMPTY);
-  VHostConf.setSsl_Certificate(i, EMPTY);
-  VHostConf.setSsl_Password(i, EMPTY);
-  Ssl_Privatekey->value(EMPTY);
-  Ssl_Certificate->value(EMPTY);
-  Ssl_Password->value(EMPTY);
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}
-
-// set default vals
-switch(pval) {
-  case 0 :
-    Port->value(80);
-    VHostConf.setPort(i, 80);
-    break;
-  case 1 :
-    Port->value(443);
-    VHostConf.setPort(i, 443);
-    break;
-  case 2 :
-    Port->value(21);
-    VHostConf.setPort(i, 21);
-    break;
-  case 3 :
-    Port->value(270);
-    VHostConf.setPort(i, 270);
-    break;
-  default :
-    break;
-};
-}
-void MainDlg::cb_Protocol(Fl_Choice* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Protocol_i(o,v);
-}
-
-Fl_Menu_Item MainDlg::menu_Protocol[] = {
- {ctrl_gettext("HTTP"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("HTTPS"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("FTP"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {ctrl_gettext("CONTROL"), 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
-};
-
-void MainDlg::cb_Ssl_Privatekey_i(Fl_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setSsl_Privatekey(i, Ssl_Privatekey->value());
-}
-void MainDlg::cb_Ssl_Privatekey(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Ssl_Privatekey_i(o,v);
-}
-
-void MainDlg::cb_Ssl_Certificate_i(Fl_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setSsl_Certificate(i, Ssl_Certificate->value());
-}
-void MainDlg::cb_Ssl_Certificate(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Ssl_Certificate_i(o,v);
-}
-
-void MainDlg::cb_Ssl_Password_i(Fl_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setSsl_Password(i, Ssl_Password->value());
-}
-void MainDlg::cb_Ssl_Password(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Ssl_Password_i(o,v);
-}
-
-void MainDlg::cb_SslButton1_i(Fl_Button*, void*) {
-  char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setSsl_Privatekey(i, chrptr);
-  Ssl_Privatekey->value(chrptr);
-};
-}
-void MainDlg::cb_SslButton1(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_SslButton1_i(o,v);
-}
-
-void MainDlg::cb_SslButton2_i(Fl_Button*, void*) {
-  char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setSsl_Certificate(i, chrptr);
-  Ssl_Certificate->value(chrptr);
-};
-}
-void MainDlg::cb_SslButton2(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_SslButton2_i(o,v);
-}
-
-void MainDlg::cb_Add4_i(Fl_Button*, void*) {
-  char * val;
-int NameNo, i;
-bool reg = false;
-val = (char *)regex_input(LanguageXMLEnter_Host, reg);
-if(val != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  i = VHostConf.addHost(NameNo, val, reg);
-  VHostConf.populateHost(NameNo, Host);
-  Host->value(i + 1);
-};
-}
-void MainDlg::cb_Add4(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Add4_i(o,v);
-}
-
-void MainDlg::cb_Remove4_i(Fl_Button*, void*) {
-  int i, NameNo;
-i = Host->value();
-if(i != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  VHostConf.removeHost(NameNo, i - 1);
-  VHostConf.populateHost(NameNo, Host);
-};
-}
-void MainDlg::cb_Remove4(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Remove4_i(o,v);
-}
-
-void MainDlg::cb_Add5_i(Fl_Button*, void*) {
-  char * val;
-int NameNo, i;
-bool reg;
-val = (char *)regex_input(LanguageXMLEnter_Ip, reg);
-if(val != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  i = VHostConf.addIp(NameNo, val, reg);
-  VHostConf.populateIp(NameNo, Ip);
-  Ip->value(i + 1);
-};
-}
-void MainDlg::cb_Add5(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Add5_i(o,v);
-}
-
-void MainDlg::cb_Remove5_i(Fl_Button*, void*) {
-  int i, NameNo;
-i = Ip->value();
-if(i != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  VHostConf.removeIp(NameNo, i - 1);
-  VHostConf.populateIp(NameNo, Ip);
-};
-}
-void MainDlg::cb_Remove5(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Remove5_i(o,v);
-}
-
-void MainDlg::cb_Port_i(Fl_Value_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setPort(i, (int)Port->value());
-}
-void MainDlg::cb_Port(Fl_Value_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Port_i(o,v);
-}
-
-void MainDlg::cb_Allow_CGI_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_CGI, Allow_CGI->value());
-}
-void MainDlg::cb_Allow_CGI(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_CGI_i(o,v);
-}
-
-void MainDlg::cb_Allow_ISAPI_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_ISAPI, Allow_ISAPI->value());
-}
-void MainDlg::cb_Allow_ISAPI(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_ISAPI_i(o,v);
-}
-
-void MainDlg::cb_Allow_MSCGI_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_MSCGI, Allow_MSCGI->value());
-}
-void MainDlg::cb_Allow_MSCGI(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_MSCGI_i(o,v);
-}
-
-void MainDlg::cb_Allow_WINCGI_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_WINCGI, Allow_WINCGI->value());
-}
-void MainDlg::cb_Allow_WINCGI(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_WINCGI_i(o,v);
-}
-
-void MainDlg::cb_Allow_FASTCGI_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_FASTCGI, Allow_FASTCGI->value());
-}
-void MainDlg::cb_Allow_FASTCGI(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_FASTCGI_i(o,v);
-}
-
-void MainDlg::cb_Allow_SCGI_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_SCGI, Allow_SCGI->value());
-}
-void MainDlg::cb_Allow_SCGI(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_SCGI_i(o,v);
-}
-
-void MainDlg::cb_Allow_SEND_LINK_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_SEND_LINK, Allow_SEND_LINK->value());
-}
-void MainDlg::cb_Allow_SEND_LINK(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_SEND_LINK_i(o,v);
-}
-
-void MainDlg::cb_Allow_EXTERNAL_COMMANDS_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_EXTERNAL_COMMANDS, Allow_EXTERNAL_COMMANDS->value());
-}
-void MainDlg::cb_Allow_EXTERNAL_COMMANDS(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_EXTERNAL_COMMANDS_i(o,v);
-}
-
-void MainDlg::cb_Allow_SEND_FILE_i(Fl_Check_Button*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_SEND_FILE, Allow_SEND_FILE->value());
-}
-void MainDlg::cb_Allow_SEND_FILE(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Allow_SEND_FILE_i(o,v);
-}
-
-void MainDlg::cb_Docroot_i(Fl_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setDocroot(i, Docroot->value());
-}
-void MainDlg::cb_Docroot(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Docroot_i(o,v);
-}
-
-void MainDlg::cb_Sysfolder_i(Fl_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setSysfolder(i, Sysfolder->value());
-}
-void MainDlg::cb_Sysfolder(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Sysfolder_i(o,v);
-}
-
-void MainDlg::cb_Browse1_i(Fl_Button*, void*) {
-  char * chrptr = fl_dir_chooser("", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setDocroot(i, chrptr);
-  Docroot->value(chrptr);
-};
-}
-void MainDlg::cb_Browse1(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Browse1_i(o,v);
-}
-
-void MainDlg::cb_Browse2_i(Fl_Button*, void*) {
-  char * chrptr = fl_dir_chooser("", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setSysfolder(i, chrptr);
-  Sysfolder->value(chrptr);
-};
-}
-void MainDlg::cb_Browse2(Fl_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Browse2_i(o,v);
-}
-
-void MainDlg::cb_Accesseslog_i(Fl_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setAccesseslog(i, Accesseslog->value());
-}
-void MainDlg::cb_Accesseslog(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Accesseslog_i(o,v);
-}
-
-void MainDlg::cb_Warninglog_i(Fl_Input*, void*) {
-  Changed = true;
-int i = Name->value();
-VHostConf.setWarninglog(i, Warninglog->value());
-}
-void MainDlg::cb_Warninglog(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->parent()->parent()->parent()->user_data()))->cb_Warninglog_i(o,v);
-}
-
-void MainDlg::cb_Server_Admin_i(Fl_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Server_Admin(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Server_Admin_i(o,v);
-}
-
-void MainDlg::cb_Control_Admin_i(Fl_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Control_Admin(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Control_Admin_i(o,v);
-}
-
-void MainDlg::cb_Control_Password_i(Fl_Input*, void*) {
-  Changed = true;
-}
-void MainDlg::cb_Control_Password(Fl_Input* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Control_Password_i(o,v);
-}
-
-void MainDlg::cb_Control_Enabled_i(Fl_Check_Button*, void*) {
-  Changed = true;
-if(Control_Enabled->value() == 1) {
-  Control_Admin->activate();
-  Control_Password->activate();
-}
-else {
-  Control_Admin->deactivate();
-  Control_Password->deactivate();
-};
-}
-void MainDlg::cb_Control_Enabled(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Control_Enabled_i(o,v);
-}
-
-void MainDlg::cb_Allow_Anonymous_i(Fl_Check_Button*, void*) {
-  Changed = true;
-if ( Allow_Anonymous->value() == 1 ){
-Anonymous_Needs_Password->activate();
-}
-else{
-Anonymous_Needs_Password->deactivate();
-};
-}
-void MainDlg::cb_Allow_Anonymous(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Allow_Anonymous_i(o,v);
-}
-
-void MainDlg::cb_Anonymous_Needs_Password_i(Fl_Check_Button*, void*) {
-  Changed=true;
-}
-void MainDlg::cb_Anonymous_Needs_Password(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Anonymous_Needs_Password_i(o,v);
-}
-
-void MainDlg::cb_Allow_Asynchronous_Cmds_i(Fl_Check_Button*, void*) {
-  Changed=true;
-}
-void MainDlg::cb_Allow_Asynchronous_Cmds(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Allow_Asynchronous_Cmds_i(o,v);
-}
-
-void MainDlg::cb_Allow_Pipelining_i(Fl_Check_Button*, void*) {
-  Changed=true;
-}
-void MainDlg::cb_Allow_Pipelining(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Allow_Pipelining_i(o,v);
-}
-
-void MainDlg::cb_Allow_Store_Cmds_i(Fl_Check_Button*, void*) {
-  Changed=true;
-}
-void MainDlg::cb_Allow_Store_Cmds(Fl_Check_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->parent()->user_data()))->cb_Allow_Store_Cmds_i(o,v);
-}
-
-void MainDlg::cb_ConfTypeDlgLocal_i(Fl_Round_Button*, void*) {
-  ConfType = 1;
-}
-void MainDlg::cb_ConfTypeDlgLocal(Fl_Round_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->user_data()))->cb_ConfTypeDlgLocal_i(o,v);
-}
-
-void MainDlg::cb_ConfTypeDlgUser_i(Fl_Round_Button*, void*) {
-  ConfType = 2;
-}
-void MainDlg::cb_ConfTypeDlgUser(Fl_Round_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->user_data()))->cb_ConfTypeDlgUser_i(o,v);
-}
-
-void MainDlg::cb_ConfTypeDlgGlobal_i(Fl_Round_Button*, void*) {
-  ConfType = 3;
-}
-void MainDlg::cb_ConfTypeDlgGlobal(Fl_Round_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->parent()->user_data()))->cb_ConfTypeDlgGlobal_i(o,v);
-}
-
-#include <FL/Fl_Image.H>
-static unsigned char idata_logo[] =
-{118,118,163,251,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,111,111,160,254,112,112,161,254,113,113,161,254,115,115,
-162,254,116,116,163,254,116,116,163,254,115,115,162,254,113,113,161,254,112,112,
-161,254,111,111,160,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,
-159,254,110,110,159,254,110,110,159,254,110,110,159,254,110,110,159,254,118,118,
-163,251,109,109,157,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,103,103,153,255,104,104,155,255,107,107,157,255,111,111,159,255,115,115,
-161,255,117,117,163,255,117,117,163,255,115,115,162,255,112,112,160,255,109,109,
-157,255,106,106,155,255,103,103,154,255,103,103,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,109,109,
-157,255,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,
-153,255,103,103,154,255,104,104,155,255,106,106,155,255,107,107,156,255,107,107,
-157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,
-157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,
-157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,
-157,255,108,108,157,255,107,107,157,255,107,107,156,255,106,106,155,255,104,104,
-155,255,104,104,154,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,103,103,153,255,104,104,154,255,104,104,
-155,255,106,106,155,255,107,107,156,255,107,107,157,255,108,108,157,255,108,108,
-157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,
-157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,
-157,255,108,108,157,255,108,108,157,255,108,108,157,255,108,108,157,255,107,107,
-157,255,109,109,157,255,111,111,158,255,114,114,162,255,121,121,165,255,126,126,
-169,255,130,130,172,255,131,131,173,255,129,129,171,255,123,123,167,255,116,116,
-163,255,110,110,159,255,106,106,155,255,103,103,154,255,103,103,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,153,255,104,104,
-154,255,106,106,156,255,109,109,157,255,112,112,160,255,116,116,162,255,118,118,
-164,255,120,120,165,255,121,121,165,255,121,121,166,255,121,121,166,255,121,121,
-166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,
-166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,
-166,255,121,121,165,255,119,119,164,255,117,117,163,255,113,113,161,255,110,110,
-159,255,107,107,156,255,104,104,155,255,103,103,154,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,103,103,154,255,104,104,155,255,107,107,156,255,110,110,
-159,255,113,113,161,255,117,117,163,255,119,119,164,255,121,121,165,255,121,121,
-166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,
-166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,
-166,255,121,121,166,255,121,121,166,255,121,121,166,255,120,120,165,255,119,119,
-164,255,118,118,163,255,120,120,165,255,124,124,168,255,132,132,173,255,155,155,
-189,255,195,195,215,255,197,197,216,255,161,161,193,255,140,140,178,255,129,129,
-171,255,118,118,164,255,111,111,159,255,106,106,155,255,103,103,154,255,103,103,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,103,103,153,255,103,103,153,255,103,103,153,255,103,103,
-153,255,103,103,153,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,154,255,106,106,
-155,255,110,110,158,255,116,116,162,255,123,123,167,255,129,129,171,255,134,134,
-175,255,137,137,177,255,140,140,178,255,140,140,179,255,140,140,179,255,140,140,
-179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,
-179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,
-179,255,139,139,178,255,136,136,176,255,132,132,173,255,126,126,169,255,119,119,
-164,255,113,113,160,255,107,107,157,255,104,104,155,255,103,103,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,103,103,153,255,104,104,155,255,107,107,157,255,113,113,160,255,119,119,
-164,255,126,126,169,255,132,132,173,255,136,136,176,255,139,139,178,255,140,140,
-179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,
-179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,
-179,255,140,140,179,255,140,140,179,255,140,140,178,255,139,139,177,255,135,135,
-175,255,133,133,174,255,134,134,174,255,137,137,177,255,155,155,189,255,218,218,
-231,255,249,249,251,255,250,250,251,255,228,228,237,255,175,175,202,255,146,146,
-182,255,131,131,173,255,119,119,164,255,111,111,159,255,106,106,155,255,103,103,
-154,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,
-153,255,103,103,154,255,104,104,154,255,104,104,155,255,105,105,155,255,105,105,
-155,255,105,105,155,255,104,104,154,255,103,103,154,255,103,103,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,104,104,154,255,108,108,
-157,255,115,115,162,255,125,125,168,255,137,137,176,255,148,148,183,255,156,156,
-189,255,162,162,193,255,165,165,195,255,166,166,195,255,166,166,195,255,166,166,
-195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,
-195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,
-195,255,164,164,194,255,160,160,191,255,153,153,187,255,143,143,181,255,132,132,
-173,255,121,121,166,255,113,113,160,255,106,106,156,255,103,103,154,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,103,103,154,255,106,106,156,255,113,113,160,255,121,121,166,255,132,132,
-173,255,143,143,181,255,153,153,187,255,160,160,191,255,164,164,194,255,166,166,
-195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,
-195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,
-195,255,166,166,195,255,166,166,195,255,165,165,195,255,163,163,193,255,157,157,
-190,255,152,152,186,255,149,149,184,255,150,150,185,255,173,173,200,255,239,239,
-244,255,255,255,255,255,255,255,255,255,255,255,255,255,234,234,241,255,179,179,
-204,255,148,148,183,255,131,131,173,255,119,119,164,255,110,110,159,255,106,106,
-155,255,103,103,154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,
-154,255,105,105,155,255,107,107,156,255,109,109,158,255,111,111,159,255,111,111,
-159,255,110,110,158,255,107,107,157,255,106,106,155,255,104,104,154,255,103,103,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,105,105,155,255,112,112,
-159,255,122,122,166,255,136,136,176,255,228,228,237,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,249,249,251,255,149,149,
-185,255,133,133,174,255,119,119,165,255,110,110,158,255,104,104,155,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,104,104,155,255,110,110,158,255,119,119,165,255,133,133,173,255,149,149,
-185,255,249,249,251,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,243,243,247,255,162,162,193,255,181,181,206,255,240,240,
-245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,234,234,
-241,255,179,179,204,255,148,148,183,255,131,131,172,255,119,119,164,255,110,110,
-159,255,106,106,155,255,103,103,154,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,153,255,104,104,
-155,255,108,108,157,255,113,113,160,255,119,119,163,255,122,122,166,255,122,122,
-166,255,119,119,165,255,115,115,161,255,110,110,159,255,106,106,156,255,103,103,
-154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,106,106,155,255,114,114,
-161,255,127,127,170,255,145,145,182,255,232,232,240,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,202,202,
-220,255,145,145,182,255,128,128,170,255,115,115,161,255,106,106,156,255,103,103,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,
-153,255,106,106,156,255,115,115,161,255,127,127,170,255,145,145,182,255,202,202,
-220,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,249,255,171,171,198,255,186,186,209,255,242,242,
-246,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,232,232,239,255,179,179,204,255,147,147,183,255,130,130,172,255,118,118,
-164,255,110,110,158,255,106,106,155,255,103,103,154,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,103,103,153,255,104,104,154,255,107,107,
-157,255,114,114,161,255,122,122,166,255,133,133,174,255,163,163,194,255,165,165,
-195,255,136,136,176,255,125,125,169,255,117,117,163,255,110,110,158,255,105,105,
-155,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,106,106,156,255,116,116,
-162,255,131,131,173,255,152,152,186,255,234,234,241,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,236,236,
-242,255,158,158,191,255,137,137,176,255,120,120,165,255,109,109,158,255,104,104,
-154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,104,104,
-154,255,109,109,157,255,120,120,165,255,136,136,176,255,158,158,191,255,236,236,
-242,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,246,246,249,255,175,175,201,255,189,189,211,255,243,243,
-247,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,254,254,254,255,230,230,238,255,179,179,204,255,146,146,183,255,130,130,
-171,255,118,118,163,255,110,110,158,255,105,105,155,255,103,103,154,255,102,102,
-153,255,102,102,153,255,102,102,153,255,103,103,154,255,106,106,156,255,113,113,
-160,255,122,122,167,255,135,135,175,255,157,157,189,255,216,216,229,255,238,238,
-244,255,183,183,206,255,139,139,178,255,126,126,169,255,115,115,161,255,107,107,
-156,255,103,103,154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,106,106,156,255,117,117,
-163,255,134,134,174,255,157,157,189,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,189,189,210,255,147,147,183,255,127,127,169,255,113,113,160,255,106,106,
-155,255,103,103,153,255,102,102,153,255,102,102,153,255,103,103,153,255,105,105,
-155,255,113,113,160,255,127,127,169,255,146,146,183,255,188,188,210,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,246,246,249,255,176,176,202,255,178,178,203,255,217,217,
-230,255,249,249,251,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,253,253,254,255,227,227,236,255,177,177,203,255,145,145,
-182,255,129,129,171,255,118,118,163,255,110,110,158,255,105,105,155,255,103,103,
-154,255,103,103,153,255,103,103,154,255,105,105,155,255,110,110,159,255,120,120,
-165,255,134,134,175,255,153,153,187,255,202,202,220,255,249,249,251,255,255,255,
-255,255,231,231,239,255,166,166,195,255,136,136,175,255,121,121,165,255,110,110,
-158,255,104,104,154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,157,157,190,255,134,134,175,255,118,118,164,255,108,108,
-157,255,103,103,154,255,102,102,153,255,102,102,153,255,103,103,154,255,107,107,
-157,255,118,118,163,255,134,134,175,255,157,157,189,255,221,221,232,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,246,246,248,255,175,175,202,255,168,168,197,255,185,185,
-208,255,236,236,242,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,252,252,253,255,225,225,235,255,174,174,
-201,255,145,145,181,255,128,128,171,255,117,117,163,255,110,110,158,255,105,105,
-155,255,104,104,154,255,105,105,155,255,109,109,157,255,118,118,163,255,131,131,
-172,255,149,149,184,255,190,190,212,255,239,239,244,255,255,255,255,255,255,255,
-255,255,252,252,253,255,222,222,233,255,144,144,181,255,126,126,169,255,113,113,
-160,255,105,105,155,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,250,250,252,255,175,175,201,255,143,143,181,255,124,124,168,255,112,112,
-159,255,104,104,155,255,102,102,153,255,102,102,153,255,104,104,155,255,111,111,
-159,255,124,124,167,255,143,143,180,255,173,173,201,255,250,250,252,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,172,172,200,255,162,162,193,255,170,170,
-199,255,223,223,234,255,253,253,254,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,253,255,224,224,
-234,255,171,171,199,255,144,144,181,255,128,128,171,255,117,117,163,255,110,110,
-158,255,107,107,156,255,109,109,157,255,115,115,162,255,127,127,170,255,145,145,
-181,255,177,177,202,255,233,233,240,255,254,254,254,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,151,151,185,255,130,130,171,255,115,115,
-161,255,106,106,155,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,215,215,228,255,154,154,187,255,131,131,173,255,116,116,
-162,255,107,107,156,255,103,103,154,255,103,103,154,255,106,106,156,255,115,115,
-162,255,131,131,172,255,152,152,186,255,209,209,224,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,169,169,197,255,156,156,189,255,158,158,
-191,255,198,198,217,255,242,242,247,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,
-253,255,224,224,234,255,170,170,198,255,143,143,181,255,128,128,170,255,118,118,
-163,255,113,113,160,255,115,115,162,255,125,125,168,255,140,140,179,255,166,166,
-195,255,224,224,234,255,253,253,254,255,255,255,255,255,255,255,255,255,255,255,
-255,255,254,254,255,255,240,240,245,255,155,155,188,255,132,132,173,255,116,116,
-162,255,106,106,156,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,164,164,194,255,140,140,178,255,121,121,
-166,255,110,110,158,255,104,104,154,255,104,104,154,255,110,110,158,255,121,121,
-165,255,139,139,177,255,163,163,193,255,240,240,245,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,166,166,196,255,150,150,186,255,149,149,
-185,255,167,167,197,255,222,222,233,255,253,253,254,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,252,252,253,255,224,224,234,255,167,167,197,255,141,141,179,255,128,128,
-170,255,122,122,167,255,126,126,169,255,137,137,177,255,158,158,190,255,210,210,
-225,255,249,249,251,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,252,252,253,255,232,232,240,255,155,155,189,255,133,133,173,255,116,116,
-162,255,106,106,156,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,236,236,242,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,196,196,216,255,149,149,184,255,128,128,
-170,255,113,113,161,255,106,106,156,255,106,106,156,255,113,113,161,255,127,127,
-170,255,148,148,184,255,195,195,215,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,236,236,242,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,165,165,195,255,146,146,183,255,141,141,
-180,255,150,150,185,255,199,199,218,255,247,247,250,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,252,252,253,255,221,221,232,255,166,166,195,255,141,141,
-179,255,135,135,175,255,140,140,178,255,153,153,187,255,196,196,216,255,244,244,
-248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,252,252,253,255,229,229,238,255,153,153,187,255,131,131,172,255,115,115,
-162,255,106,106,155,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,231,231,239,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,231,231,239,255,159,159,191,255,136,136,
-175,255,119,119,164,255,110,110,158,255,109,109,158,255,118,118,164,255,135,135,
-175,255,158,158,190,255,226,226,235,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,236,236,242,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,163,163,194,255,143,143,181,255,135,135,
-176,255,140,140,179,255,167,167,196,255,224,224,234,255,253,253,254,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,251,251,252,255,211,211,225,255,162,162,
-193,255,149,149,185,255,155,155,189,255,187,187,210,255,239,239,244,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,251,251,252,255,224,224,234,255,149,149,184,255,128,128,170,255,113,113,
-161,255,105,105,155,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,201,201,219,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,176,176,202,255,145,145,
-181,255,125,125,169,255,114,114,161,255,114,114,161,255,125,125,168,255,143,143,
-181,255,175,175,201,255,250,250,252,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,211,211,226,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,163,163,193,255,140,140,179,255,129,129,
-172,255,131,131,173,255,145,145,182,255,187,187,209,255,238,238,243,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,232,232,239,255,180,180,
-205,255,164,164,194,255,183,183,207,255,230,230,238,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,247,247,250,255,199,199,217,255,142,142,180,255,124,124,167,255,111,111,
-159,255,104,104,155,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,182,182,206,255,245,245,248,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,216,216,228,255,154,154,
-188,255,133,133,174,255,121,121,166,255,121,121,165,255,133,133,173,255,154,154,
-187,255,215,215,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,250,250,252,255,182,182,206,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,139,139,178,255,125,125,
-169,255,123,123,168,255,134,134,175,255,157,157,190,255,210,210,225,255,250,250,
-252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,254,254,254,255,230,230,238,255,187,187,
-209,255,178,178,204,255,218,218,230,255,252,252,253,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,236,236,242,255,167,167,197,255,134,134,175,255,119,119,164,255,109,109,
-157,255,104,104,154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,182,182,206,255,216,216,229,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,245,245,248,255,165,165,
-195,255,142,142,180,255,130,130,171,255,130,130,171,255,142,142,179,255,164,164,
-194,255,245,245,248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,216,216,229,255,182,182,206,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,138,138,178,255,122,122,
-167,255,117,117,164,255,125,125,169,255,144,144,181,255,178,178,204,255,229,229,
-238,255,254,254,254,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,254,254,254,255,227,227,236,255,187,187,
-209,255,193,193,213,255,236,236,242,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,244,
-248,255,193,193,213,255,143,143,181,255,126,126,169,255,113,113,161,255,106,106,
-156,255,103,103,154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,182,182,206,255,187,187,209,255,250,250,252,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,203,203,
-220,255,154,154,187,255,140,140,179,255,140,140,179,255,152,152,187,255,196,196,
-216,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,192,192,213,255,182,182,206,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,121,121,
-166,255,113,113,161,255,118,118,164,255,135,135,175,255,157,157,190,255,206,206,
-222,255,249,249,251,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,253,253,254,255,222,222,233,255,184,184,
-208,255,197,197,216,255,238,238,244,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,240,240,245,255,197,197,
-217,255,151,151,186,255,131,131,173,255,118,118,164,255,109,109,158,255,104,104,
-155,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,182,182,206,255,182,182,206,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,236,236,
-242,255,166,166,196,255,154,154,187,255,153,153,187,255,165,165,195,255,226,226,
-235,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,236,236,242,255,182,182,206,255,182,182,206,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,120,120,
-165,255,110,110,159,255,113,113,161,255,128,128,170,255,149,149,184,255,201,201,
-219,255,250,250,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,252,252,253,255,217,217,230,255,182,182,
-206,255,194,194,214,255,236,236,243,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,254,254,254,255,239,239,244,255,196,196,215,255,153,153,
-187,255,134,134,175,255,121,121,165,255,112,112,159,255,106,106,155,255,103,103,
-154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,181,181,205,255,178,178,204,255,201,201,219,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,191,191,213,255,169,169,197,255,169,169,197,255,184,184,208,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,206,206,222,255,181,181,205,255,182,182,206,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,109,109,158,255,110,110,159,255,122,122,167,255,142,142,179,255,191,191,
-212,255,248,248,250,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,254,254,254,255,232,232,239,255,201,201,
-219,255,211,211,225,255,243,243,247,255,255,255,255,255,255,255,255,255,255,255,
-255,255,254,254,255,255,232,232,239,255,194,194,214,255,155,155,189,255,136,136,
-175,255,122,122,166,255,112,112,160,255,107,107,156,255,104,104,154,255,103,103,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,174,174,201,255,169,169,198,255,176,176,203,255,240,240,
-245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,221,221,232,255,182,182,206,255,182,182,206,255,216,216,229,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,245,245,
-248,255,179,179,204,255,171,171,199,255,176,176,202,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,108,108,158,255,107,107,157,255,118,118,164,255,135,135,175,255,168,168,
-197,255,228,228,237,255,253,253,254,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,253,255,241,241,
-245,255,244,244,248,255,253,253,254,255,255,255,255,255,255,255,255,255,255,255,
-255,255,248,248,251,255,200,200,218,255,158,158,191,255,138,138,177,255,122,122,
-167,255,112,112,160,255,107,107,156,255,104,104,154,255,103,103,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,169,169,197,255,161,161,193,255,166,166,196,255,211,211,
-226,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,250,250,252,255,187,187,209,255,182,182,206,255,245,245,248,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,216,216,
-229,255,169,169,197,255,163,163,194,255,170,170,198,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,108,108,157,255,106,106,155,255,114,114,161,255,128,128,171,255,150,150,
-186,255,202,202,220,255,248,248,250,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,
-253,255,224,224,234,255,174,174,200,255,144,144,181,255,126,126,169,255,113,113,
-161,255,107,107,156,255,104,104,154,255,103,103,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,164,164,195,255,154,154,188,255,157,157,189,255,177,177,
-203,255,250,250,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,211,211,226,255,201,201,219,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,185,185,
-208,255,159,159,191,255,156,156,189,255,165,165,195,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,108,108,157,255,104,104,155,255,111,111,159,255,122,122,167,255,141,141,
-179,255,182,182,207,255,241,241,246,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,247,247,
-250,255,194,194,215,255,155,155,188,255,134,134,174,255,118,118,164,255,108,108,
-157,255,104,104,154,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,161,161,192,255,148,148,184,255,148,148,184,255,160,160,
-192,255,221,221,232,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,240,240,245,255,231,231,239,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,231,231,239,255,163,163,
-194,255,150,150,185,255,149,149,185,255,162,162,193,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,103,103,154,255,108,108,157,255,117,117,163,255,132,132,
-173,255,158,158,191,255,222,222,233,255,254,254,254,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,251,251,
-253,255,199,199,218,255,147,147,183,255,126,126,169,255,113,113,160,255,106,106,
-155,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,158,158,191,255,143,143,180,255,140,140,179,255,150,150,
-185,255,183,183,206,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,196,196,216,255,153,153,
-187,255,142,142,180,255,144,144,181,255,159,159,191,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,103,103,153,255,106,106,155,255,112,112,160,255,124,124,
-167,255,141,141,179,255,186,186,210,255,237,237,243,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,254,254,254,255,244,244,
-247,255,200,200,218,255,143,143,181,255,120,120,165,255,110,110,158,255,104,104,
-155,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,157,157,190,255,139,139,178,255,134,134,174,255,141,141,
-179,255,161,161,192,255,236,236,242,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,164,164,195,255,143,143,
-181,255,136,136,175,255,140,140,179,255,157,157,190,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,104,104,154,255,108,108,157,255,116,116,
-163,255,130,130,172,255,152,152,186,255,196,196,216,255,237,237,243,255,254,254,
-254,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,249,249,251,255,226,226,236,255,191,191,
-212,255,152,152,186,255,127,127,170,255,115,115,161,255,107,107,157,255,103,103,
-154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,156,156,189,255,136,136,176,255,128,128,171,255,133,133,
-174,255,151,151,185,255,208,208,224,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,215,215,228,255,154,154,187,255,136,136,
-175,255,130,130,172,255,137,137,177,255,156,156,189,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,103,103,154,255,106,106,155,255,111,111,
-159,255,122,122,167,255,140,140,178,255,163,163,193,255,201,201,219,255,240,240,
-245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,247,247,250,255,217,217,230,255,176,176,203,255,148,148,
-184,255,130,130,172,255,118,118,163,255,110,110,158,255,105,105,155,255,103,103,
-154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,155,155,189,255,134,134,175,255,124,124,168,255,127,127,
-169,255,141,141,179,255,166,166,195,255,250,250,252,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,175,175,202,255,144,144,181,255,128,128,
-171,255,125,125,169,255,135,135,175,255,156,156,189,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,103,103,153,255,104,104,154,255,108,108,
-157,255,118,118,164,255,134,134,175,255,156,156,189,255,185,185,208,255,223,223,
-234,255,254,254,254,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,254,254,254,255,224,224,234,255,181,181,206,255,154,154,187,255,134,134,
-175,255,120,120,165,255,111,111,159,255,106,106,156,255,104,104,154,255,103,103,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,155,155,189,255,134,134,174,255,121,121,166,255,121,121,
-165,255,133,133,173,255,155,155,189,255,216,216,229,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,226,226,235,255,158,158,191,255,135,135,175,255,122,122,
-167,255,122,122,166,255,134,134,174,255,155,155,189,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,102,102,153,255,103,103,154,255,107,107,
-157,255,118,118,163,255,133,133,174,255,155,155,189,255,198,198,217,255,236,236,
-242,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,253,253,254,255,222,222,233,255,167,167,196,255,141,141,179,255,124,124,
-168,255,112,112,160,255,106,106,156,255,104,104,154,255,103,103,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,155,155,189,255,133,133,174,255,119,119,164,255,116,116,
-162,255,125,125,169,255,145,145,182,255,181,181,206,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,196,196,215,255,148,148,184,255,128,128,170,255,118,118,
-163,255,119,119,165,255,133,133,174,255,155,155,189,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,102,102,153,255,104,104,154,255,109,109,
-157,255,119,119,165,255,136,136,176,255,164,164,194,255,222,222,233,255,253,253,
-253,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,254,254,255,255,223,223,234,255,159,159,190,255,132,132,173,255,116,116,
-163,255,107,107,157,255,103,103,154,255,103,103,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,155,155,189,255,133,133,173,255,118,118,163,255,112,112,
-160,255,119,119,165,255,136,136,176,255,160,160,191,255,231,231,239,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,240,240,245,255,163,163,194,255,139,139,178,255,121,121,166,255,113,113,
-161,255,118,118,163,255,133,133,173,255,155,155,189,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,102,102,153,255,104,104,155,255,110,110,
-159,255,122,122,167,255,142,142,180,255,190,190,211,255,241,241,245,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,248,248,250,255,206,206,222,255,148,148,183,255,125,125,169,255,112,112,
-160,255,105,105,155,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,155,155,189,255,133,133,173,255,117,117,163,255,110,110,
-158,255,114,114,161,255,128,128,171,255,149,149,185,255,196,196,216,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,214,214,228,255,152,152,187,255,131,131,173,255,116,116,162,255,110,110,
-159,255,117,117,163,255,133,133,173,255,155,155,189,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,102,102,153,255,104,104,155,255,112,112,
-160,255,125,125,169,255,151,151,186,255,221,221,233,255,254,254,254,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,253,253,
-254,255,221,221,232,255,166,166,195,255,137,137,176,255,120,120,165,255,109,109,
-157,255,104,104,154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,107,107,156,255,118,118,
-163,255,135,135,175,255,159,159,191,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,226,226,235,255,155,155,189,255,133,133,173,255,116,116,162,255,107,107,
-157,255,110,110,158,255,122,122,166,255,140,140,178,255,164,164,195,255,245,245,
-248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,250,
-252,255,174,174,201,255,143,143,181,255,124,124,168,255,111,111,159,255,108,108,
-157,255,116,116,163,255,133,133,173,255,155,155,189,255,226,226,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,162,162,193,255,137,137,177,255,119,119,
-165,255,107,107,157,255,102,102,153,255,102,102,153,255,105,105,155,255,113,113,
-160,255,127,127,169,255,152,152,187,255,223,223,233,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,253,253,
-254,255,211,211,225,255,151,151,186,255,130,130,171,255,115,115,162,255,107,107,
-156,255,103,103,154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,106,106,156,255,117,117,
-163,255,134,134,174,255,157,157,189,255,236,236,242,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,225,225,235,255,154,154,187,255,131,131,173,255,115,115,162,255,106,106,
-156,255,107,107,156,255,116,116,162,255,131,131,173,255,153,153,187,255,214,214,
-228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,226,226,
-235,255,157,157,189,255,134,134,175,255,118,118,164,255,108,108,157,255,107,107,
-156,255,115,115,162,255,131,131,173,255,154,154,187,255,225,225,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,160,160,191,255,136,136,176,255,119,119,
-164,255,107,107,157,255,102,102,153,255,102,102,153,255,105,105,155,255,112,112,
-160,255,125,125,168,255,147,147,184,255,212,212,226,255,251,251,252,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,246,246,
-249,255,193,193,214,255,141,141,179,255,122,122,167,255,112,112,159,255,105,105,
-155,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,106,106,156,255,116,116,
-162,255,131,131,173,255,152,152,186,255,234,234,241,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,223,223,233,255,149,149,184,255,129,129,171,255,114,114,161,255,106,106,
-155,255,104,104,155,255,112,112,159,255,124,124,168,255,142,142,180,255,171,171,
-199,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,186,186,
-209,255,145,145,182,255,127,127,169,255,113,113,160,255,106,106,155,255,106,106,
-155,255,114,114,161,255,129,129,171,255,149,149,184,255,223,223,233,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,155,155,188,255,133,133,174,255,118,118,
-163,255,107,107,156,255,102,102,153,255,102,102,153,255,104,104,155,255,110,110,
-159,255,121,121,166,255,138,138,177,255,177,177,203,255,237,237,243,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,244,247,255,193,193,
-213,255,150,150,185,255,128,128,171,255,116,116,162,255,107,107,157,255,104,104,
-154,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,106,106,155,255,114,114,
-161,255,127,127,170,255,145,145,182,255,232,232,240,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,219,219,231,255,143,143,180,255,125,125,169,255,113,113,160,255,105,105,
-155,255,103,103,154,255,108,108,157,255,118,118,163,255,132,132,173,255,151,151,
-186,255,222,222,233,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,239,239,245,255,155,155,
-188,255,135,135,175,255,119,119,165,255,109,109,158,255,104,104,154,255,105,105,
-155,255,113,113,160,255,125,125,169,255,143,143,180,255,219,219,231,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,244,244,248,255,148,148,183,255,129,129,171,255,115,115,
-162,255,106,106,156,255,102,102,153,255,102,102,153,255,104,104,154,255,108,108,
-157,255,118,118,163,255,135,135,175,255,167,167,196,255,222,222,233,255,244,244,
-248,255,245,245,248,255,246,246,249,255,239,239,244,255,187,187,210,255,147,147,
-183,255,132,132,173,255,119,119,165,255,110,110,159,255,105,105,155,255,103,103,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,105,105,155,255,112,112,
-159,255,122,122,166,255,136,136,176,255,228,228,237,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,213,213,227,255,134,134,174,255,121,121,165,255,110,110,159,255,104,104,
-155,255,103,103,153,255,106,106,155,255,112,112,160,255,123,123,167,255,137,137,
-177,255,182,182,206,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,196,196,216,255,140,140,
-178,255,125,125,168,255,113,113,161,255,106,106,156,255,103,103,153,255,104,104,
-155,255,110,110,159,255,121,121,165,255,134,134,174,255,213,213,227,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,242,242,246,255,138,138,177,255,123,123,167,255,112,112,
-160,255,106,106,155,255,102,102,153,255,102,102,153,255,103,103,154,255,106,106,
-156,255,112,112,159,255,122,122,166,255,134,134,175,255,152,152,186,255,164,164,
-194,255,168,168,198,255,168,168,198,255,163,163,194,255,140,140,179,255,130,130,
-171,255,120,120,165,255,112,112,160,255,106,106,156,255,104,104,154,255,103,103,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,104,104,154,255,108,108,
-157,255,115,115,162,255,125,125,168,255,137,137,176,255,148,148,183,255,156,156,
-189,255,162,162,193,255,165,165,195,255,166,166,195,255,166,166,195,255,166,166,
-195,255,166,166,195,255,164,164,195,255,161,161,193,255,155,155,188,255,146,146,
-183,255,135,135,175,255,123,123,167,255,114,114,161,255,107,107,157,255,104,104,
-154,255,102,102,153,255,104,104,154,255,108,108,157,255,115,115,161,255,124,124,
-168,255,136,136,175,255,146,146,183,255,155,155,189,255,161,161,193,255,164,164,
-195,255,166,166,195,255,166,166,195,255,166,166,195,255,166,166,195,255,165,165,
-195,255,162,162,193,255,156,156,189,255,148,148,184,255,137,137,177,255,126,126,
-169,255,116,116,162,255,109,109,157,255,104,104,155,255,102,102,153,255,104,104,
-154,255,107,107,157,255,114,114,161,255,123,123,167,255,135,135,175,255,146,146,
-183,255,155,155,188,255,161,161,193,255,164,164,195,255,166,166,195,255,166,166,
-195,255,166,166,195,255,166,166,195,255,165,165,195,255,163,163,193,255,157,157,
-190,255,149,149,184,255,139,139,177,255,126,126,169,255,116,116,163,255,109,109,
-157,255,104,104,155,255,102,102,153,255,102,102,153,255,103,103,153,255,104,104,
-155,255,107,107,157,255,112,112,160,255,119,119,164,255,125,125,169,255,131,131,
-172,255,134,134,174,255,133,133,174,255,130,130,171,255,124,124,167,255,117,117,
-163,255,112,112,159,255,107,107,156,255,104,104,154,255,103,103,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,110,110,159,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,154,255,106,106,
-155,255,110,110,158,255,116,116,162,255,123,123,167,255,129,129,171,255,134,134,
-175,255,137,137,177,255,140,140,178,255,140,140,179,255,140,140,179,255,140,140,
-179,255,140,140,179,255,140,140,178,255,137,137,177,255,134,134,174,255,128,128,
-171,255,122,122,166,255,115,115,161,255,109,109,158,255,106,106,155,255,103,103,
-154,255,102,102,153,255,103,103,154,255,105,105,155,255,109,109,157,255,114,114,
-161,255,121,121,166,255,128,128,170,255,133,133,174,255,137,137,176,255,139,139,
-178,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,179,255,140,140,
-178,255,137,137,177,255,134,134,174,255,129,129,171,255,122,122,167,255,115,115,
-162,255,110,110,158,255,106,106,155,255,103,103,154,255,102,102,153,255,103,103,
-154,255,106,106,155,255,109,109,158,255,115,115,161,255,122,122,166,255,128,128,
-171,255,134,134,174,255,137,137,177,255,140,140,178,255,140,140,179,255,140,140,
-179,255,140,140,179,255,140,140,179,255,140,140,178,255,139,139,177,255,135,135,
-175,255,130,130,172,255,124,124,168,255,116,116,163,255,110,110,159,255,106,106,
-156,255,103,103,154,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,
-154,255,105,105,155,255,107,107,156,255,110,110,159,255,113,113,161,255,116,116,
-163,255,118,118,163,255,117,117,163,255,115,115,162,255,112,112,160,255,109,109,
-157,255,106,106,155,255,104,104,154,255,103,103,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,110,110,
-159,254,108,108,157,254,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,153,255,104,104,
-154,255,106,106,156,255,109,109,157,255,112,112,160,255,116,116,162,255,118,118,
-164,255,120,120,165,255,121,121,165,255,121,121,166,255,121,121,166,255,121,121,
-166,255,121,121,166,255,121,121,165,255,120,120,165,255,118,118,164,255,115,115,
-162,255,112,112,160,255,108,108,157,255,106,106,155,255,104,104,154,255,103,103,
-153,255,102,102,153,255,102,102,153,255,103,103,154,255,105,105,155,255,107,107,
-157,255,111,111,159,255,115,115,161,255,118,118,163,255,119,119,165,255,121,121,
-165,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,166,255,121,121,
-165,255,119,119,165,255,118,118,163,255,115,115,162,255,112,112,159,255,108,108,
-157,255,106,106,155,255,104,104,154,255,103,103,153,255,102,102,153,255,103,103,
-153,255,104,104,154,255,106,106,155,255,108,108,157,255,112,112,160,255,115,115,
-162,255,118,118,164,255,120,120,165,255,121,121,165,255,121,121,166,255,121,121,
-166,255,121,121,166,255,121,121,166,255,121,121,166,255,120,120,165,255,119,119,
-164,255,116,116,162,255,113,113,160,255,109,109,158,255,106,106,156,255,104,104,
-155,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,153,255,103,103,
-153,255,103,103,154,255,104,104,154,255,105,105,155,255,106,106,156,255,107,107,
-156,255,107,107,157,255,107,107,157,255,106,106,156,255,105,105,155,255,104,104,
-154,255,103,103,154,255,103,103,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,108,108,
-157,254,119,119,164,253,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,112,112,
-159,255,112,112,160,255,113,113,161,255,114,114,161,255,116,116,162,255,116,116,
-162,255,117,117,163,255,117,117,163,255,117,117,163,255,117,117,163,255,117,117,
-163,255,117,117,163,255,117,117,163,255,117,117,163,255,116,116,162,255,115,115,
-162,255,114,114,161,255,113,113,161,255,112,112,160,255,112,112,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,112,112,159,255,112,112,160,255,113,113,
-160,255,114,114,161,255,115,115,162,255,116,116,162,255,116,116,162,255,117,117,
-163,255,117,117,163,255,117,117,163,255,117,117,163,255,117,117,163,255,117,117,
-163,255,117,117,163,255,116,116,162,255,115,115,162,255,114,114,161,255,113,113,
-160,255,112,112,160,255,112,112,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,112,112,159,255,112,112,160,255,113,113,161,255,114,114,161,255,115,115,
-162,255,116,116,162,255,117,117,163,255,117,117,163,255,117,117,163,255,117,117,
-163,255,117,117,163,255,117,117,163,255,117,117,163,255,117,117,163,255,116,116,
-162,255,116,116,162,255,114,114,161,255,113,113,161,255,113,113,160,255,112,112,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,112,112,159,255,112,112,159,255,112,112,
-159,255,112,112,159,255,112,112,159,255,112,112,159,255,112,112,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,
-159,255,111,111,159,255,111,111,159,255,111,111,159,255,111,111,159,255,119,119,
-164,253,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,224,224,
-235,255,184,184,207,255,112,112,160,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,184,184,207,255,184,184,207,255,245,245,248,255,255,255,
-255,255,255,255,255,255,255,255,255,255,214,214,228,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,
-207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,
-214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,163,163,
-194,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,
-255,255,255,255,255,255,255,255,255,255,163,163,194,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,204,204,221,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,163,163,194,255,194,194,214,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,153,153,187,255,102,102,
-153,255,143,143,180,255,214,214,228,255,255,255,255,255,255,255,255,255,204,204,
-221,255,122,122,167,255,102,102,153,255,102,102,153,255,112,112,160,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,214,214,228,255,153,153,187,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,153,153,187,255,102,102,153,255,102,102,153,255,143,143,
-180,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,122,122,167,255,102,102,153,255,102,102,
-153,255,102,102,153,255,133,133,173,255,224,224,235,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,235,235,241,255,143,143,
-180,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,153,153,187,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,163,163,194,255,102,102,153,255,102,102,153,255,122,122,167,255,184,184,
-207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,214,214,
-228,255,153,153,187,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,153,153,187,255,102,102,153,255,102,102,153,255,143,143,180,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,
-214,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,153,255,133,133,
-173,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,143,143,180,255,102,102,153,255,133,133,
-173,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,235,235,241,255,112,112,160,255,102,102,153,255,102,102,153,255,235,235,
-241,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,112,112,160,255,102,102,153,255,143,143,
-180,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,235,235,241,255,122,122,167,255,102,102,
-153,255,102,102,153,255,102,102,153,255,112,112,160,255,224,224,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,245,245,
-248,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,204,204,221,255,102,102,153,255,102,102,153,255,235,235,241,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,245,245,248,255,112,112,160,255,102,102,153,255,143,143,180,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,235,235,241,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,
-153,255,112,112,160,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,204,204,
-221,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,214,214,
-228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,143,143,
-180,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,122,122,167,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,163,163,194,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,173,173,201,255,102,102,153,255,163,163,194,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,184,184,207,255,102,102,153,255,143,143,180,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,122,122,167,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,122,122,167,255,102,102,153,255,102,102,153,255,214,214,
-228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,112,112,160,255,102,102,153,255,204,204,
-221,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,112,112,160,255,143,143,
-180,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,224,224,235,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,235,235,241,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,122,122,167,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,112,112,160,255,102,102,153,255,224,224,235,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,112,112,160,255,143,143,180,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,224,224,235,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,245,245,248,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,
-207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,173,173,201,255,102,102,153,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,163,163,194,255,143,143,
-180,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,173,173,
-201,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,163,163,194,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,214,214,228,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,224,224,
-235,255,102,102,153,255,143,143,180,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,163,163,194,255,143,143,180,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,173,173,201,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,235,235,241,255,102,102,153,255,102,102,153,255,102,102,153,255,112,112,
-160,255,235,235,241,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,204,204,221,255,102,102,153,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,163,163,
-194,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,214,214,228,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,153,153,187,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,173,173,
-201,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,163,163,194,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,245,245,248,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,112,112,160,255,204,204,221,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,
-221,255,122,122,167,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,245,245,248,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,
-207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,122,122,167,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,235,235,241,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,112,112,
-160,255,112,112,160,255,245,245,248,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,221,255,122,122,
-167,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,133,133,173,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,122,122,167,255,184,184,207,255,235,235,
-241,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,173,173,
-201,255,122,122,167,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,221,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,112,112,160,255,245,245,
-248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,221,255,102,102,
-153,255,163,163,194,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,173,173,201,255,122,122,
-167,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,204,204,221,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,112,112,160,255,245,245,248,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,133,133,173,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,133,133,
-173,255,112,112,160,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,122,122,167,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,112,112,160,255,245,245,248,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,163,163,194,255,102,102,
-153,255,214,214,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,133,133,173,255,112,112,
-160,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,245,245,248,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,133,133,173,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,122,122,167,255,214,214,228,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,235,235,241,255,163,163,194,255,102,102,
-153,255,102,102,153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,
-255,255,255,255,255,255,184,184,207,255,122,122,167,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,204,204,221,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,163,163,194,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,112,112,160,255,133,133,
-173,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,235,235,241,255,163,163,194,255,102,102,153,255,102,102,
-153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,184,184,
-207,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,204,204,221,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,143,143,180,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,173,173,201,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,224,224,235,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,122,122,167,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,184,184,
-207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,173,173,201,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,
-214,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,
-153,255,102,102,153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,153,153,187,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,143,143,
-180,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,204,204,
-221,255,255,255,255,255,255,255,255,255,153,153,187,255,102,102,153,255,245,245,
-248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,153,153,187,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,214,214,228,255,163,163,194,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,143,143,180,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,133,133,
-173,255,102,102,153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,
-255,255,255,255,255,255,133,133,173,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,
-221,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,143,143,
-180,255,255,255,255,255,245,245,248,255,102,102,153,255,153,153,187,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,133,133,173,255,102,102,
-153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,133,133,
-173,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,
-207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,184,184,
-207,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,173,173,
-201,255,102,102,153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,214,214,228,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,112,112,160,255,245,245,248,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,235,235,241,255,184,184,207,255,102,102,153,255,204,204,221,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,173,173,201,255,102,102,
-153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,214,214,
-228,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,112,112,
-160,255,245,245,248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,235,235,241,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,
-221,255,102,102,153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,143,143,180,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,163,163,194,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,173,173,201,255,122,122,167,255,112,112,160,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,221,255,102,102,
-153,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,143,143,180,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,163,163,194,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,102,102,153,255,122,122,167,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,204,204,221,255,102,102,153,255,102,102,
-153,255,102,102,153,255,245,245,248,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,173,173,
-201,255,102,102,153,255,235,235,241,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,214,214,228,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,224,224,235,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,245,245,248,255,112,112,160,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,173,173,201,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,173,173,201,255,102,102,
-153,255,235,235,241,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,214,214,228,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,122,122,167,255,102,102,153,255,214,214,228,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,112,112,160,255,102,102,
-153,255,112,112,160,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,112,112,
-160,255,112,112,160,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,122,122,167,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,143,143,180,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,173,173,201,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,224,224,235,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,112,112,160,255,112,112,
-160,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,143,143,180,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,122,122,167,255,102,102,153,255,163,163,194,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,133,133,173,255,102,102,
-153,255,163,163,194,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,
-153,255,133,133,173,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,235,235,241,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,133,133,173,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,133,133,
-173,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,122,122,167,255,102,102,153,255,102,102,153,255,224,224,
-235,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,102,102,153,255,102,102,
-153,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,112,112,160,255,102,102,
-153,255,173,173,201,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,122,122,
-167,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,122,122,
-167,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,143,143,180,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,245,245,248,255,112,112,160,255,102,102,153,255,173,173,
-201,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,122,122,167,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,122,122,167,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,122,122,167,255,102,102,153,255,102,102,153,255,122,122,
-167,255,235,235,241,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,143,143,180,255,102,102,153,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,143,143,180,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,
-214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,245,245,248,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,143,143,180,255,102,102,153,255,102,102,153,255,184,184,
-207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,184,184,207,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,
-153,255,112,112,160,255,184,184,207,255,255,255,255,255,255,255,255,255,255,255,
-255,255,184,184,207,255,133,133,173,255,133,133,173,255,214,214,228,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,
-221,255,184,184,207,255,143,143,180,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,143,143,180,255,224,224,235,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,214,214,
-228,255,184,184,207,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,
-153,255,214,214,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,173,173,201,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,173,173,201,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,245,245,248,255,112,112,160,255,102,102,
-153,255,153,153,187,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,204,204,221,255,184,184,
-207,255,143,143,180,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,143,143,180,255,224,224,235,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,214,214,228,255,184,184,
-207,255,122,122,167,255,102,102,153,255,102,102,153,255,102,102,153,255,214,214,
-228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,173,173,201,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,173,173,201,255,194,194,214,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,122,122,167,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,194,194,
-214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,184,184,207,255,184,184,207,255,143,143,
-180,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,163,163,194,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,235,235,241,255,255,255,255,255,255,255,255,255,255,255,255,255,184,184,
-207,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,112,112,160,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,122,122,167,255,214,214,228,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,163,163,194,255,102,102,
-153,255,194,194,214,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,194,194,214,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,235,235,
-241,255,255,255,255,255,255,255,255,255,184,184,207,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,112,112,160,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,194,194,214,255,102,102,
-153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,153,255,102,102,
-153,255,122,122,167,255,214,214,228,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,240,255,255,255,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,244,255,255,255,225,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,255,240,255,255,
-255,225};
-static Fl_RGB_Image image_logo(idata_logo, 150, 80, 4, 0);
-
-void MainDlg::cb_OK_i(Fl_Return_Button*, void*) {
-  AboutDlg->hide();
-}
-void MainDlg::cb_OK(Fl_Return_Button* o, void* v) {
-  ((MainDlg*)(o->parent()->user_data()))->cb_OK_i(o,v);
-}
-
-Fl_Double_Window* MainDlg::make_window() {
-  { ConfDlg = new Fl_Double_Window(550, 360, ctrl_gettext("MyServer Configure"));
-    ConfDlg->callback((Fl_Callback*)cb_ConfDlg, (void*)(this));
-    { Fl_Menu_Bar* o = new Fl_Menu_Bar(0, 0, 550, 25);
-      o->menu(menu_);
-    } // Fl_Menu_Bar* o
-    { Fl_Tabs* o = new Fl_Tabs(0, 25, 635, 335);
-      { Fl_Group* o = new Fl_Group(0, 50, 550, 310, ctrl_gettext("System"));
-        { Buffer_Size = new Fl_Value_Input(295, 60, 115, 25, ctrl_gettext("Memory buffer (in bytes):"));
-          Buffer_Size->maximum(5.24288e+06);
-          Buffer_Size->step(1);
-          Buffer_Size->callback((Fl_Callback*)cb_Buffer_Size);
-        } // Fl_Value_Input* Buffer_Size
-        { Verbosity = new Fl_Choice(295, 90, 115, 25, ctrl_gettext("Verbosity level:"));
-          Verbosity->down_box(FL_BORDER_BOX);
-          Verbosity->callback((Fl_Callback*)cb_Verbosity);
-          Verbosity->when(FL_WHEN_CHANGED);
-          Verbosity->menu(menu_Verbosity);
-        } // Fl_Choice* Verbosity
-        { Max_Log_File_Size = new Fl_Value_Input(295, 120, 115, 25, ctrl_gettext("Max log file size (in bytes):"));
-          Max_Log_File_Size->maximum(5.24288e+07);
-          Max_Log_File_Size->step(1);
-          Max_Log_File_Size->callback((Fl_Callback*)cb_Max_Log_File_Size);
-        } // Fl_Value_Input* Max_Log_File_Size
-        { Nthreads_Static = new Fl_Value_Input(295, 150, 115, 30, ctrl_gettext("Always active threads:"));
-          Nthreads_Static->maximum(1000);
-          Nthreads_Static->step(1);
-          Nthreads_Static->callback((Fl_Callback*)cb_Nthreads_Static);
-        } // Fl_Value_Input* Nthreads_Static
-        { Nthreads_Max = new Fl_Value_Input(295, 185, 115, 25, ctrl_gettext("Maximum number of threads:"));
-          Nthreads_Max->maximum(1000);
-          Nthreads_Max->step(1);
-          Nthreads_Max->callback((Fl_Callback*)cb_Nthreads_Max);
-        } // Fl_Value_Input* Nthreads_Max
-        { Language = new Fl_Choice(295, 215, 115, 25, ctrl_gettext("Language:"));
-          Language->down_box(FL_BORDER_BOX);
-          Language->callback((Fl_Callback*)cb_Language);
-          Language->when(FL_WHEN_CHANGED);
-        } // Fl_Choice* Language
-        o->end();
-      } // Fl_Group* o
-      { Fl_Group* o = new Fl_Group(0, 50, 550, 310, ctrl_gettext("Server"));
-        o->hide();
-        { Connection_Timeout = new Fl_Value_Input(295, 60, 115, 25, ctrl_gettext("Connection time-out (in sec):"));
-          Connection_Timeout->maximum(3600);
-          Connection_Timeout->step(1);
-          Connection_Timeout->callback((Fl_Callback*)cb_Connection_Timeout);
-        } // Fl_Value_Input* Connection_Timeout
-        { Max_Connections = new Fl_Value_Input(295, 90, 115, 25, ctrl_gettext("Max connections:"));
-          Max_Connections->maximum(5.24288e+06);
-          Max_Connections->step(1);
-          Max_Connections->callback((Fl_Callback*)cb_Max_Connections);
-        } // Fl_Value_Input* Max_Connections
-        { Gzip_Threshold = new Fl_Value_Input(295, 120, 115, 25, ctrl_gettext("Gzip compression threshold (in bytes):"));
-          Gzip_Threshold->maximum(5.24288e+06);
-          Gzip_Threshold->step(1);
-          Gzip_Threshold->callback((Fl_Callback*)cb_Gzip_Threshold);
-        } // Fl_Value_Input* Gzip_Threshold
-        { Browsefolder_Css = new Fl_Input(295, 150, 115, 25, ctrl_gettext("Stylesheet:"));
-          Browsefolder_Css->callback((Fl_Callback*)cb_Browsefolder_Css);
-          Browsefolder_Css->when(FL_WHEN_CHANGED);
-        } // Fl_Input* Browsefolder_Css
-        { Fl_Button* o = new Fl_Button(420, 150, 85, 25, ctrl_gettext("Browse..."));
-          o->callback((Fl_Callback*)cb_Browse);
-        } // Fl_Button* o
-        { Use_Errors_Files = new Fl_Check_Button(295, 180, 25, 25, ctrl_gettext("Personalized error pages:"));
-          Use_Errors_Files->down_box(FL_DOWN_BOX);
-          Use_Errors_Files->callback((Fl_Callback*)cb_Use_Errors_Files);
-          Use_Errors_Files->align(FL_ALIGN_LEFT);
-          Use_Errors_Files->when(FL_WHEN_CHANGED);
-        } // Fl_Check_Button* Use_Errors_Files
-        { Fl_Group* o = new Fl_Group(115, 205, 345, 145, ctrl_gettext("Default file names:"));
-          o->tooltip(ctrl_gettext("Default file to send in a directory when none is specified"));
-          o->box(FL_ENGRAVED_BOX);
-          o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE);
-          { Default_Filename = new Fl_Browser(135, 230, 195, 105);
-            Default_Filename->type(2);
-          } // Fl_Browser* Default_Filename
-          { Fl_Button* o = new Fl_Button(350, 230, 85, 25, ctrl_gettext("Add..."));
-            o->callback((Fl_Callback*)cb_Add);
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(350, 265, 85, 25, ctrl_gettext("Remove"));
-            o->callback((Fl_Callback*)cb_Remove1);
-          } // Fl_Button* o
-          o->end();
-        } // Fl_Group* o
-        o->end();
-      } // Fl_Group* o
-      { Fl_Group* o = new Fl_Group(0, 50, 550, 310, ctrl_gettext("MIME"));
-        o->hide();
-        { Fl_Group* o = new Fl_Group(10, 60, 530, 290);
-          o->box(FL_ENGRAVED_FRAME);
-          { Fl_Group* o = new Fl_Group(20, 70, 195, 270, ctrl_gettext("Extension:"));
-            o->box(FL_ENGRAVED_FRAME);
-            o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE);
-            { Ext = new Fl_Browser(31, 95, 170, 190);
-              Ext->type(2);
-              Ext->callback((Fl_Callback*)cb_Ext);
-            } // Fl_Browser* Ext
-            { Fl_Button* o = new Fl_Button(30, 300, 80, 25, ctrl_gettext("Add..."));
-              o->callback((Fl_Callback*)cb_Add1);
-            } // Fl_Button* o
-            { Fl_Button* o = new Fl_Button(120, 300, 80, 25, ctrl_gettext("Remove"));
-              o->callback((Fl_Callback*)cb_Remove2);
-            } // Fl_Button* o
-            o->end();
-          } // Fl_Group* o
-          { Mime = new Fl_Choice(310, 95, 220, 25, ctrl_gettext("MIME Type:"));
-            Mime->down_box(FL_BORDER_BOX);
-            Mime->callback((Fl_Callback*)cb_Mime);
-            Mime->when(FL_WHEN_CHANGED);
-          } // Fl_Choice* Mime
-          { Fl_Button* o = new Fl_Button(310, 125, 90, 25, ctrl_gettext("Add..."));
-            o->callback((Fl_Callback*)cb_Add2);
-          } // Fl_Button* o
-          { Cmd = new Fl_Choice(310, 165, 220, 25, ctrl_gettext("Action:"));
-            Cmd->down_box(FL_BORDER_BOX);
-            Cmd->callback((Fl_Callback*)cb_Cmd);
-            Cmd->when(FL_WHEN_CHANGED);
-            Cmd->menu(menu_Cmd);
-          } // Fl_Choice* Cmd
-          { Manager = new Fl_Input(310, 205, 220, 25, ctrl_gettext("Manager:"));
-            Manager->callback((Fl_Callback*)cb_Manager);
-          } // Fl_Input* Manager
-          { ManagerButton = new Fl_Button(310, 235, 90, 25, ctrl_gettext("Browse..."));
-            ManagerButton->callback((Fl_Callback*)cb_ManagerButton);
-          } // Fl_Button* ManagerButton
-          o->end();
-        } // Fl_Group* o
-        o->end();
-      } // Fl_Group* o
-      { Fl_Group* o = new Fl_Group(0, 50, 635, 310, ctrl_gettext("Hosts"));
-        o->hide();
-        { Fl_Group* o = new Fl_Group(10, 60, 530, 45);
-          o->box(FL_ENGRAVED_FRAME);
-          { Name = new Fl_Choice(75, 70, 275, 25, ctrl_gettext("Name:"));
-            Name->down_box(FL_BORDER_BOX);
-            Name->callback((Fl_Callback*)cb_Name);
-            Name->when(FL_WHEN_CHANGED);
-          } // Fl_Choice* Name
-          { Fl_Button* o = new Fl_Button(360, 70, 80, 25, ctrl_gettext("Add..."));
-            o->callback((Fl_Callback*)cb_Add3);
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(450, 70, 80, 25, ctrl_gettext("Remove"));
-            o->callback((Fl_Callback*)cb_Remove3);
-          } // Fl_Button* o
-          o->end();
-        } // Fl_Group* o
-        { Fl_Group* o = new Fl_Group(10, 110, 625, 240);
-          o->box(FL_ENGRAVED_FRAME);
-          { Fl_Tabs* o = new Fl_Tabs(19, 120, 616, 225);
-            { Fl_Group* o = new Fl_Group(20, 145, 510, 195, ctrl_gettext("Protocol"));
-              o->hide();
-              { Protocol = new Fl_Choice(180, 155, 215, 25, ctrl_gettext("Protocol:"));
-                Protocol->down_box(FL_BORDER_BOX);
-                Protocol->callback((Fl_Callback*)cb_Protocol);
-                Protocol->when(FL_WHEN_CHANGED);
-                Protocol->menu(menu_Protocol);
-              } // Fl_Choice* Protocol
-              { Ssl_Privatekey = new Fl_Input(180, 185, 215, 25, ctrl_gettext("SSL private key:"));
-                Ssl_Privatekey->callback((Fl_Callback*)cb_Ssl_Privatekey);
-                Ssl_Privatekey->when(FL_WHEN_CHANGED);
-                Ssl_Privatekey->deactivate();
-              } // Fl_Input* Ssl_Privatekey
-              { Ssl_Certificate = new Fl_Input(180, 215, 215, 25, ctrl_gettext("SSL certificate:"));
-                Ssl_Certificate->callback((Fl_Callback*)cb_Ssl_Certificate);
-                Ssl_Certificate->when(FL_WHEN_CHANGED);
-                Ssl_Certificate->deactivate();
-              } // Fl_Input* Ssl_Certificate
-              { Ssl_Password = new Fl_Input(180, 245, 215, 25, ctrl_gettext("SSL password:"));
-                Ssl_Password->type(5);
-                Ssl_Password->callback((Fl_Callback*)cb_Ssl_Password);
-                Ssl_Password->when(FL_WHEN_CHANGED);
-                Ssl_Password->deactivate();
-              } // Fl_Input* Ssl_Password
-              { SslButton1 = new Fl_Button(405, 185, 85, 25, ctrl_gettext("Browse..."));
-                SslButton1->callback((Fl_Callback*)cb_SslButton1);
-                SslButton1->deactivate();
-              } // Fl_Button* SslButton1
-              { SslButton2 = new Fl_Button(405, 215, 85, 25, ctrl_gettext("Browse..."));
-                SslButton2->callback((Fl_Callback*)cb_SslButton2);
-                SslButton2->deactivate();
-              } // Fl_Button* SslButton2
-              o->end();
-            } // Fl_Group* o
-            { Fl_Group* o = new Fl_Group(20, 145, 510, 195, ctrl_gettext("Arpa"));
-              o->hide();
-              { Host = new Fl_Browser(30, 165, 170, 135, ctrl_gettext("Host"));
-                Host->type(2);
-                Host->align(FL_ALIGN_TOP);
-              } // Fl_Browser* Host
-              { Ip = new Fl_Browser(210, 165, 170, 135, ctrl_gettext("IP"));
-                Ip->type(2);
-                Ip->align(FL_ALIGN_TOP);
-              } // Fl_Browser* Ip
-              { Fl_Button* o = new Fl_Button(30, 305, 80, 25, ctrl_gettext("Add..."));
-                o->callback((Fl_Callback*)cb_Add4);
-              } // Fl_Button* o
-              { Fl_Button* o = new Fl_Button(120, 305, 80, 25, ctrl_gettext("Remove"));
-                o->callback((Fl_Callback*)cb_Remove4);
-              } // Fl_Button* o
-              { Fl_Button* o = new Fl_Button(210, 305, 80, 25, ctrl_gettext("Add..."));
-                o->callback((Fl_Callback*)cb_Add5);
-              } // Fl_Button* o
-              { Fl_Button* o = new Fl_Button(300, 305, 80, 25, ctrl_gettext("Remove"));
-                o->callback((Fl_Callback*)cb_Remove5);
-              } // Fl_Button* o
-              { Port = new Fl_Value_Input(435, 165, 65, 25, ctrl_gettext("Port:"));
-                Port->maximum(10240);
-                Port->step(1);
-                Port->callback((Fl_Callback*)cb_Port);
-              } // Fl_Value_Input* Port
-              o->end();
-            } // Fl_Group* o
-            { Fl_Group* o = new Fl_Group(25, 140, 510, 195, ctrl_gettext("HTTP Services"));
-              o->hide();
-              { Fl_Box* o = new Fl_Box(45, 150, 115, 25, ctrl_gettext("Enable:"));
-                o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-              } // Fl_Box* o
-              { Allow_CGI = new Fl_Check_Button(65, 175, 20, 25, ctrl_gettext("CGI"));
-                Allow_CGI->down_box(FL_DOWN_BOX);
-                Allow_CGI->callback((Fl_Callback*)cb_Allow_CGI);
-                Allow_CGI->align(FL_ALIGN_RIGHT);
-                Allow_CGI->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_CGI
-              { Allow_ISAPI = new Fl_Check_Button(65, 195, 20, 25, ctrl_gettext("ISAPI"));
-                Allow_ISAPI->down_box(FL_DOWN_BOX);
-                Allow_ISAPI->callback((Fl_Callback*)cb_Allow_ISAPI);
-                Allow_ISAPI->align(FL_ALIGN_RIGHT);
-                Allow_ISAPI->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_ISAPI
-              { Allow_MSCGI = new Fl_Check_Button(65, 215, 20, 25, ctrl_gettext("MSCGI"));
-                Allow_MSCGI->down_box(FL_DOWN_BOX);
-                Allow_MSCGI->callback((Fl_Callback*)cb_Allow_MSCGI);
-                Allow_MSCGI->align(FL_ALIGN_RIGHT);
-                Allow_MSCGI->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_MSCGI
-              { Allow_WINCGI = new Fl_Check_Button(65, 235, 20, 25, ctrl_gettext("WINCGI"));
-                Allow_WINCGI->down_box(FL_DOWN_BOX);
-                Allow_WINCGI->callback((Fl_Callback*)cb_Allow_WINCGI);
-                Allow_WINCGI->align(FL_ALIGN_RIGHT);
-                Allow_WINCGI->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_WINCGI
-              { Allow_FASTCGI = new Fl_Check_Button(65, 255, 20, 25, ctrl_gettext("FASTCGI"));
-                Allow_FASTCGI->down_box(FL_DOWN_BOX);
-                Allow_FASTCGI->callback((Fl_Callback*)cb_Allow_FASTCGI);
-                Allow_FASTCGI->align(FL_ALIGN_RIGHT);
-                Allow_FASTCGI->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_FASTCGI
-              { Allow_SCGI = new Fl_Check_Button(235, 175, 20, 25, ctrl_gettext("SCGI"));
-                Allow_SCGI->down_box(FL_DOWN_BOX);
-                Allow_SCGI->callback((Fl_Callback*)cb_Allow_SCGI);
-                Allow_SCGI->align(FL_ALIGN_RIGHT);
-                Allow_SCGI->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_SCGI
-              { Allow_SEND_LINK = new Fl_Check_Button(235, 195, 20, 25, ctrl_gettext("SEND LINK"));
-                Allow_SEND_LINK->down_box(FL_DOWN_BOX);
-                Allow_SEND_LINK->callback((Fl_Callback*)cb_Allow_SEND_LINK);
-                Allow_SEND_LINK->align(FL_ALIGN_RIGHT);
-                Allow_SEND_LINK->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_SEND_LINK
-              { Allow_EXTERNAL_COMMANDS = new Fl_Check_Button(235, 215, 20, 25, ctrl_gettext("EXTERNAL COMMANDS"));
-                Allow_EXTERNAL_COMMANDS->down_box(FL_DOWN_BOX);
-                Allow_EXTERNAL_COMMANDS->callback((Fl_Callback*)cb_Allow_EXTERNAL_COMMANDS);
-                Allow_EXTERNAL_COMMANDS->align(FL_ALIGN_RIGHT);
-                Allow_EXTERNAL_COMMANDS->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_EXTERNAL_COMMANDS
-              { Allow_SEND_FILE = new Fl_Check_Button(235, 235, 20, 25, ctrl_gettext("SEND FILE"));
-                Allow_SEND_FILE->down_box(FL_DOWN_BOX);
-                Allow_SEND_FILE->callback((Fl_Callback*)cb_Allow_SEND_FILE);
-                Allow_SEND_FILE->align(FL_ALIGN_RIGHT);
-                Allow_SEND_FILE->when(FL_WHEN_CHANGED);
-              } // Fl_Check_Button* Allow_SEND_FILE
-              o->end();
-            } // Fl_Group* o
-            { Fl_Group* o = new Fl_Group(20, 145, 510, 195, ctrl_gettext("Directories"));
-              o->hide();
-              { Docroot = new Fl_Input(180, 155, 215, 25, ctrl_gettext("Document root:"));
-                Docroot->callback((Fl_Callback*)cb_Docroot);
-                Docroot->when(FL_WHEN_CHANGED);
-              } // Fl_Input* Docroot
-              { Sysfolder = new Fl_Input(180, 185, 215, 25, ctrl_gettext("System folder:"));
-                Sysfolder->callback((Fl_Callback*)cb_Sysfolder);
-                Sysfolder->when(FL_WHEN_CHANGED);
-              } // Fl_Input* Sysfolder
-              { Fl_Button* o = new Fl_Button(405, 155, 85, 25, ctrl_gettext("Browse..."));
-                o->callback((Fl_Callback*)cb_Browse1);
-              } // Fl_Button* o
-              { Fl_Button* o = new Fl_Button(405, 185, 85, 25, ctrl_gettext("Browse..."));
-                o->callback((Fl_Callback*)cb_Browse2);
-              } // Fl_Button* o
-              o->end();
-            } // Fl_Group* o
-            { Fl_Group* o = new Fl_Group(20, 145, 510, 195, ctrl_gettext("Logs"));
-              { Accesseslog = new Fl_Input(180, 155, 215, 25, ctrl_gettext("Accesses log file:"));
-                Accesseslog->callback((Fl_Callback*)cb_Accesseslog);
-                Accesseslog->when(FL_WHEN_CHANGED);
-              } // Fl_Input* Accesseslog
-              { Warninglog = new Fl_Input(180, 185, 215, 25, ctrl_gettext("Warning log file:"));
-                Warninglog->callback((Fl_Callback*)cb_Warninglog);
-                Warninglog->when(FL_WHEN_CHANGED);
-              } // Fl_Input* Warninglog
-              o->end();
-            } // Fl_Group* o
-            o->end();
-          } // Fl_Tabs* o
-          o->end();
-        } // Fl_Group* o
-        o->end();
-      } // Fl_Group* o
-      { Fl_Group* o = new Fl_Group(0, 50, 550, 310, ctrl_gettext("Administrator"));
-        o->hide();
-        { Server_Admin = new Fl_Input(295, 60, 190, 25, ctrl_gettext("Administrator e-mail:"));
-          Server_Admin->callback((Fl_Callback*)cb_Server_Admin);
-          Server_Admin->when(FL_WHEN_CHANGED);
-        } // Fl_Input* Server_Admin
-        { Control_Admin = new Fl_Input(295, 90, 190, 25, ctrl_gettext("Administrator user name:"));
-          Control_Admin->callback((Fl_Callback*)cb_Control_Admin);
-          Control_Admin->when(FL_WHEN_CHANGED);
-          Control_Admin->deactivate();
-        } // Fl_Input* Control_Admin
-        { Control_Password = new Fl_Input(295, 120, 190, 25, ctrl_gettext("Administrator password:"));
-          Control_Password->type(5);
-          Control_Password->callback((Fl_Callback*)cb_Control_Password);
-          Control_Password->when(FL_WHEN_CHANGED);
-          Control_Password->deactivate();
-        } // Fl_Input* Control_Password
-        { Control_Enabled = new Fl_Check_Button(295, 150, 25, 25, ctrl_gettext("Enable control protocol:"));
-          Control_Enabled->down_box(FL_DOWN_BOX);
-          Control_Enabled->callback((Fl_Callback*)cb_Control_Enabled);
-          Control_Enabled->align(FL_ALIGN_LEFT);
-          Control_Enabled->when(FL_WHEN_CHANGED);
-        } // Fl_Check_Button* Control_Enabled
-        o->end();
-      } // Fl_Group* o
-      { Fl_Group* o = new Fl_Group(0, 56, 549, 293, ctrl_gettext("FTP Services"));
-        o->hide();
-        { Fl_Box* o = new Fl_Box(3, 59, 115, 25, ctrl_gettext("Enable:"));
-          o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-        } // Fl_Box* o
-        { Allow_Anonymous = new Fl_Check_Button(3, 97, 20, 25, ctrl_gettext("Anonymous Access"));
-          Allow_Anonymous->down_box(FL_DOWN_BOX);
-          Allow_Anonymous->callback((Fl_Callback*)cb_Allow_Anonymous);
-          Allow_Anonymous->align(FL_ALIGN_RIGHT);
-        } // Fl_Check_Button* Allow_Anonymous
-        { Anonymous_Needs_Password = new Fl_Check_Button(269, 97, 20, 24, ctrl_gettext("Anonymous Needs Password"));
-          Anonymous_Needs_Password->down_box(FL_DOWN_BOX);
-          Anonymous_Needs_Password->callback((Fl_Callback*)cb_Anonymous_Needs_Password);
-          Anonymous_Needs_Password->align(FL_ALIGN_RIGHT);
-        } // Fl_Check_Button* Anonymous_Needs_Password
-        { Allow_Asynchronous_Cmds = new Fl_Check_Button(3, 161, 19, 22, ctrl_gettext("Asynchronous Commands"));
-          Allow_Asynchronous_Cmds->down_box(FL_DOWN_BOX);
-          Allow_Asynchronous_Cmds->callback((Fl_Callback*)cb_Allow_Asynchronous_Cmds);
-          Allow_Asynchronous_Cmds->align(FL_ALIGN_RIGHT);
-        } // Fl_Check_Button* Allow_Asynchronous_Cmds
-        { Allow_Pipelining = new Fl_Check_Button(3, 222, 21, 22, ctrl_gettext("Pipelining"));
-          Allow_Pipelining->down_box(FL_DOWN_BOX);
-          Allow_Pipelining->callback((Fl_Callback*)cb_Allow_Pipelining);
-          Allow_Pipelining->align(FL_ALIGN_RIGHT);
-        } // Fl_Check_Button* Allow_Pipelining
-        { Allow_Store_Cmds = new Fl_Check_Button(3, 284, 20, 26, ctrl_gettext("Write Commands"));
-          Allow_Store_Cmds->down_box(FL_DOWN_BOX);
-          Allow_Store_Cmds->callback((Fl_Callback*)cb_Allow_Store_Cmds);
-          Allow_Store_Cmds->align(FL_ALIGN_RIGHT);
-        } // Fl_Check_Button* Allow_Store_Cmds
-        o->end();
-      } // Fl_Group* o
-      o->end();
-    } // Fl_Tabs* o
-    ConfDlg->end();
-  } // Fl_Double_Window* ConfDlg
-  // Set FLTK function's text
-  fl_ok = ctrl_gettext("OK");
-  fl_cancel = ctrl_gettext("Cancel");
-  return ConfDlg;
-}
-
-Fl_Double_Window* MainDlg::make_type() {
-  { ConfTypeDlg = new Fl_Double_Window(303, 152, ctrl_gettext("Chose Location"));
-    ConfTypeDlg->user_data((void*)(this));
-    ConfTypeDlg->align(FL_ALIGN_CENTER);
-    { Fl_Group* o = new Fl_Group(0, 0, 305, 100, ctrl_gettext("Chose configuration file location:"));
-      o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE);
-      { ConfTypeDlgLocal = new Fl_Round_Button(105, 25, 70, 25, ctrl_gettext("Local"));
-        ConfTypeDlgLocal->tooltip(ctrl_gettext("Configuration files located in current directory"));
-        ConfTypeDlgLocal->type(102);
-        ConfTypeDlgLocal->down_box(FL_ROUND_DOWN_BOX);
-        ConfTypeDlgLocal->callback((Fl_Callback*)cb_ConfTypeDlgLocal);
-      } // Fl_Round_Button* ConfTypeDlgLocal
-      { ConfTypeDlgUser = new Fl_Round_Button(105, 45, 70, 25, ctrl_gettext("User"));
-        ConfTypeDlgUser->tooltip(ctrl_gettext("Configuration files located in ~/.myserver"));
-        ConfTypeDlgUser->type(102);
-        ConfTypeDlgUser->down_box(FL_ROUND_DOWN_BOX);
-        ConfTypeDlgUser->callback((Fl_Callback*)cb_ConfTypeDlgUser);
-      } // Fl_Round_Button* ConfTypeDlgUser
-      { ConfTypeDlgGlobal = new Fl_Round_Button(105, 65, 70, 25, ctrl_gettext("Global"));
-        ConfTypeDlgGlobal->tooltip(ctrl_gettext("Configuration files located in /etc/myserver"));
-        ConfTypeDlgGlobal->type(102);
-        ConfTypeDlgGlobal->down_box(FL_ROUND_DOWN_BOX);
-        ConfTypeDlgGlobal->callback((Fl_Callback*)cb_ConfTypeDlgGlobal);
-      } // Fl_Round_Button* ConfTypeDlgGlobal
-      o->end();
-    } // Fl_Group* o
-    { ConfTypeDlgOK = new Fl_Return_Button(65, 108, 65, 30, ctrl_gettext("OK"));
-    } // Fl_Return_Button* ConfTypeDlgOK
-    { ConfTypeDlgCancel = new Fl_Button(165, 110, 65, 30, ctrl_gettext("Cancel"));
-    } // Fl_Button* ConfTypeDlgCancel
-    ConfTypeDlg->set_modal();
-    ConfTypeDlg->end();
-  } // Fl_Double_Window* ConfTypeDlg
-  return ConfTypeDlg;
-}
-
-Fl_Double_Window* MainDlg::make_about() {
-  { AboutDlg = new Fl_Double_Window(595, 115, ctrl_gettext("About"));
-    AboutDlg->user_data((void*)(this));
-    { Fl_Group* o = new Fl_Group(15, 20, 155, 80);
-      o->image(image_logo);
-      o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
-      o->end();
-    } // Fl_Group* o
-    { AboutText = new Fl_Text_Display(185, 10, 305, 95);
-      AboutText->align(FL_ALIGN_CENTER);
-    } // Fl_Text_Display* AboutText
-    { Fl_Return_Button* o = new Fl_Return_Button(505, 10, 75, 25, ctrl_gettext("OK"));
-      o->callback((Fl_Callback*)cb_OK);
-    } // Fl_Return_Button* o
-    AboutDlg->set_modal();
-    AboutDlg->end();
-  } // Fl_Double_Window* AboutDlg
-  Fl_Text_Buffer * atext = new Fl_Text_Buffer;
-atext->text(LanguageXMLAbout_Text);
-AboutText->buffer(atext);
-  return AboutDlg;
-}
-
-Fl_Double_Window* MainDlg::make_login() {
-  { LoginDlg = new Fl_Double_Window(605, 120, ctrl_gettext("Remote Login"));
-    LoginDlg->user_data((void*)(this));
-    { LoginDlgAddress = new Fl_Input(90, 20, 275, 25, ctrl_gettext("Address:"));
-    } // Fl_Input* LoginDlgAddress
-    { LoginDlgPort = new Fl_Value_Input(420, 20, 70, 25, ctrl_gettext("Port:"));
-      LoginDlgPort->maximum(10240);
-      LoginDlgPort->step(1);
-      LoginDlgPort->value(270);
-    } // Fl_Value_Input* LoginDlgPort
-    { LoginDlgName = new Fl_Input(185, 50, 180, 25, ctrl_gettext("Login name:"));
-    } // Fl_Input* LoginDlgName
-    { LoginDlgPass = new Fl_Input(185, 80, 180, 25, ctrl_gettext("Login password:"));
-      LoginDlgPass->type(5);
-    } // Fl_Input* LoginDlgPass
-    { LoginDlgOK = new Fl_Return_Button(510, 20, 75, 25, ctrl_gettext("OK"));
-    } // Fl_Return_Button* LoginDlgOK
-    { LoginDlgCancel = new Fl_Button(510, 55, 75, 25, ctrl_gettext("Cancel"));
-    } // Fl_Button* LoginDlgCancel
-    LoginDlg->set_modal();
-    LoginDlg->end();
-  } // Fl_Double_Window* LoginDlg
-  return LoginDlg;
-}
-
-Fl_Double_Window* MainDlg::make_status() {
-  { StatusDlg = new Fl_Double_Window(275, 100, ctrl_gettext("Status"));
-    StatusDlg->user_data((void*)(this));
-    { StatusDlgGroup = new Fl_Group(10, 15, 260, 65);
-      StatusDlgGroup->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE);
-      { StatusDlgProgress = new Fl_Progress(25, 50, 230, 25);
-        StatusDlgProgress->selection_color((Fl_Color)229);
-        StatusDlgProgress->maximum(100);
-        StatusDlgProgress->minimum(0);
-        Server.setCallback(ProgressCallback, (void *)StatusDlgProgress);
-      } // Fl_Progress* StatusDlgProgress
-      StatusDlgGroup->end();
-    } // Fl_Group* StatusDlgGroup
-    StatusDlg->set_modal();
-    StatusDlg->end();
-  } // Fl_Double_Window* StatusDlg
-  return StatusDlg;
-}
-
-Fl_Double_Window* MainDlg::make_connections() {
-  { ConnectionsDlg = new Fl_Double_Window(488, 341, ctrl_gettext("Connections"));
-    ConnectionsDlg->user_data((void*)(this));
-    { ConnectionsDlgVr = new Fl_Output(65, 15, 140, 25, ctrl_gettext("Server:"));
-    } // Fl_Output* ConnectionsDlgVr
-    { ConnectionsDlgList = new Fl_Browser(10, 60, 470, 235, ctrl_gettext("Connections (ID - IP - Port - LocalIP - LocalPort - Login - PWord)"));
-      ConnectionsDlgList->type(2);
-      ConnectionsDlgList->align(FL_ALIGN_TOP);
-    } // Fl_Browser* ConnectionsDlgList
-    { ConnectionsDlgRate = new Fl_Counter(95, 305, 85, 25, ctrl_gettext("Update rate:"));
-      ConnectionsDlgRate->type(1);
-      ConnectionsDlgRate->minimum(1);
-      ConnectionsDlgRate->maximum(30);
-      ConnectionsDlgRate->step(1);
-      ConnectionsDlgRate->value(10);
-      ConnectionsDlgRate->align(FL_ALIGN_LEFT);
-    } // Fl_Counter* ConnectionsDlgRate
-    { ConnectionsDlgKill = new Fl_Button(195, 305, 130, 25, ctrl_gettext("Kill connection"));
-    } // Fl_Button* ConnectionsDlgKill
-    { ConnectionsDlgDone = new Fl_Button(340, 305, 130, 25, ctrl_gettext("Done"));
-    } // Fl_Button* ConnectionsDlgDone
-    ConnectionsDlg->set_modal();
-    ConnectionsDlg->end();
-  } // Fl_Double_Window* ConnectionsDlg
-  return ConnectionsDlg;
-}
-
-Fl_Double_Window* MainDlg::make_regask() {
-  { RegaskDlg = new Fl_Double_Window(425, 110);
-    RegaskDlg->user_data((void*)(this));
-    { RegaskDlgInput = new Fl_Input(75, 35, 340, 25);
-      RegaskDlgInput->align(FL_ALIGN_TOP_LEFT);
-    } // Fl_Input* RegaskDlgInput
-    { RegaskDlgCancel = new Fl_Button(340, 70, 75, 25, ctrl_gettext("Cancel"));
-    } // Fl_Button* RegaskDlgCancel
-    { RegaskDlgOK = new Fl_Return_Button(250, 70, 75, 25, ctrl_gettext("OK"));
-    } // Fl_Return_Button* RegaskDlgOK
-    { RegaskDlgRegex = new Fl_Check_Button(75, 65, 95, 25, ctrl_gettext("Regex"));
-      RegaskDlgRegex->down_box(FL_DOWN_BOX);
-    } // Fl_Check_Button* RegaskDlgRegex
-    { Fl_Box* o = new Fl_Box(10, 10, 55, 55);
-      o->box(FL_THIN_UP_BOX);
-      o->color(FL_WHITE);
-      o->labelfont(9);
-      o->labelsize(43);
-      o->labelcolor((Fl_Color)4);
-      o->label("?");
-    } // Fl_Box* o
-    RegaskDlg->set_modal();
-    RegaskDlg->end();
-  } // Fl_Double_Window* RegaskDlg
-  return RegaskDlg;
-}
-
-int MainDlg::ask_type() {
-  #ifdef WIN32
-return 1;
-#else
-ConfTypeDlg->show();
-int ret;
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait();
-  else if(o == ConfTypeDlgOK) {ret = 0; break;}
-  else if(o == ConfTypeDlgCancel) {ret = -1; break;}
-  else if(o == ConfTypeDlg) {ret = -1; break;}
-}
-if(ret != -1) {
-  if(ConfTypeDlgLocal->value())
-    ret = 1;
-  else if(ConfTypeDlgUser->value())
-    ret = 2;
-  else if(ConfTypeDlgGlobal->value())
-    ret = 3;
-}
-ConfTypeDlg->hide();
-return ret;
-#endif
-}
-
-int MainDlg::load_config() {
-  const char * filename;
-int i;
-#ifndef WIN32
-const int FBSIZE = strlen(getenv("HOME")) + 40;
-char FileBuffer[FBSIZE];
-#endif
-
-// Loading of main myserver.xml file
-
-switch(ConfType) {
-  case 1 :
-    filename = "myserver.xml";
-    break;
-#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/myserver.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/myserver.xml";
-    break;
-#endif
-  default :
-    return -1;
-    break;
-}
-
-xmlFile.close();
-
-if(xmlFile.open(filename) != 0)
-  return -1;
-
-load_myserver_core();
-
-// Loading of MIMEtypes.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "MIMEtypes.xml";
-    break;
-#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/MIMEtypes.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/MIMEtypes.xml";
-    break;
-#endif
-  default :
-    return -1;
-    break;
-}
-
-// Load the file
-if(MimeConf.load(filename))
-  return -1;
-
-// Populate the interface
-MimeConf.populateExt(Ext);
-MimeConf.populateMime(Mime);
-
-// Loading of virtualhosts.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "virtualhosts.xml";
-    break;
-#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/virtualhosts.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/virtualhosts.xml";
-    break;
-#endif
-  default :
-    return -1;
-    break;
-}
-
-// Load the file
-if(VHostConf.load(filename))
-  return -1;
-
-// Populate the interface
-VHostConf.populateName(Name);
-Name->value(0);
-VHostConf.populateHost(0, Host);
-VHostConf.populateIp(0, Ip);
-Port->value(VHostConf.getPort(0));
-Protocol->value(VHostConf.getProtocol(0));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(0));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(0));
-Ssl_Password->value(VHostConf.getSsl_Password(0));
-Docroot->value(VHostConf.getDocroot(0));
-Sysfolder->value(VHostConf.getSysfolder(0));
-Accesseslog->value(VHostConf.getAccesseslog(0));
-Warninglog->value(VHostConf.getWarninglog(0));
-Allow_CGI->value(VHostConf.getService(0, ALLOW_CGI));
-Allow_ISAPI->value(VHostConf.getService(0, ALLOW_ISAPI));
-Allow_MSCGI->value(VHostConf.getService(0, ALLOW_MSCGI));
-Allow_WINCGI->value(VHostConf.getService(0, ALLOW_WINCGI));
-Allow_FASTCGI->value(VHostConf.getService(0, ALLOW_FASTCGI));
-Allow_SEND_LINK->value(VHostConf.getService(0, ALLOW_SEND_LINK));
-Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(0, ALLOW_EXTERNAL_COMMANDS));
-Allow_SEND_FILE->value(VHostConf.getService(0, ALLOW_SEND_FILE));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}
-
-// End of function
-Changed = false;
-return 0;
-}
-
-int MainDlg::load_config_remote() {
-  int i;
-int ret;
-MemBuf Buffer;
-Vector list;
-
-// ======== Progress display ========
-// Say something...
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (1/5)"));
-StatusDlg->show();
-fl_wait(200);  // let fltk do its thing
-// ======== Progress display ========
-
-// Get remote languages listing
-ret = Server.getLanguages(list);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-Language->clear();
-for(i = 0; i < list.size(); i++) {
-  Language->add(list.at(i)->Text);
-}
-
-// ======== Progress display ========
-// Say something...
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (2/5)"));
-StatusDlg->show();
-fl_wait(200);  // let fltk do its thing
-// ======== Progress display ========
-
-// Get remote protocols
-ret = Server.getDynamicProtocols(list);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-VHostConf.loadProtocols(list);
-VHostConf.populateProtocol(Protocol);
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (3/5)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Load remote myserver.xml
-ret = Server.getMyserverConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-xmlFile.close();
-ret = xmlFile.openMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-load_myserver_core();
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (4/5)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Load remote MIMEtypes.xml
-ret = Server.getMIMEtypesConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-ret = MimeConf.loadMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-// Populate the interface
-MimeConf.populateExt(Ext);
-MimeConf.populateMime(Mime);
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (5/5)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Load remote virtualhosts.xml
-ret = Server.getVhostsConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-ret = VHostConf.loadMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-// Populate the interface
-VHostConf.populateName(Name);
-Name->value(0);
-VHostConf.populateHost(0, Host);
-VHostConf.populateIp(0, Ip);
-Port->value(VHostConf.getPort(0));
-Protocol->value(VHostConf.getProtocol(0));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(0));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(0));
-Ssl_Password->value(VHostConf.getSsl_Password(0));
-Docroot->value(VHostConf.getDocroot(0));
-Sysfolder->value(VHostConf.getSysfolder(0));
-Accesseslog->value(VHostConf.getAccesseslog(0));
-Warninglog->value(VHostConf.getWarninglog(0));
-Allow_CGI->value(VHostConf.getService(0, ALLOW_CGI));
-Allow_ISAPI->value(VHostConf.getService(0, ALLOW_ISAPI));
-Allow_MSCGI->value(VHostConf.getService(0, ALLOW_MSCGI));
-Allow_WINCGI->value(VHostConf.getService(0, ALLOW_WINCGI));
-Allow_FASTCGI->value(VHostConf.getService(0, ALLOW_FASTCGI));
-Allow_SCGI->value(VHostConf.getService(0, ALLOW_SCGI));
-Allow_SEND_LINK->value(VHostConf.getService(0, ALLOW_SEND_LINK));
-Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(0, ALLOW_EXTERNAL_COMMANDS));
-Allow_SEND_FILE->value(VHostConf.getService(0, ALLOW_SEND_FILE));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}
-
-// ======== Progress display ========
-fl_wait(500);  // oooo aaa effect
-StatusDlg->hide();
-// ======== Progress display ========
-
-// End of function
-Changed = false;
-return 0;
-}
-
-int MainDlg::load_myserver_core() {
-  char * chrptr;
-int i;
-// <LANGUAGE>
-Language->value(0);
-for(i = 0; i < Language->size(); i++) {
-  if(strcmpi(getValueXML("LANGUAGE"), Language->text(i)) == 0) {
-    Language->value(i);
-    break;
-  }
-}
-
-// <VERBOSITY>
-Verbosity->value(atoi(getValueXML("VERBOSITY")));
-
-// <NTHREADS_STATIC>
-Nthreads_Static->value(atoi(getValueXML("NTHREADS_STATIC")));
-
-// <NTHREADS_MAX>
-Nthreads_Max->value(atoi(getValueXML("NTHREADS_MAX")));
-
-// <BUFFER_SIZE>
-Buffer_Size->value(atoi(getValueXML("BUFFER_SIZE")));
-
-// <DEFAULT_FILENAME>
-Default_Filename->clear();
-xmlDocPtr xmlDoc = xmlFile.getDoc();
-for(xmlNode *node = xmlDoc->children; node; node = node->next)
-{
-	if(!xmlStrcmp(node->name, (const xmlChar *)"MYSERVER"))
-	{
-		for(node = node->children; node; node = node->next)
-		{
-			if(!xmlStrcmp(node->name, (const xmlChar *)"DEFAULT_FILENAME"))
-			{
-				  Default_Filename->add((char*)node->children->content);
-			}
-		}
-		break;
-	}
-}
-
-// <CONNECTION_TIMEOUT>
-Connection_Timeout->value(atoi(getValueXML("CONNECTION_TIMEOUT")));
-
-// <USE_ERRORS_FILES>
-chrptr = xmlFile.getValue("USE_ERRORS_FILES");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E')
-  Use_Errors_Files->set();
-else
-  Use_Errors_Files->clear();
-
-// <MAX_CONNECTIONS>
-Max_Connections->value(atoi(getValueXML("MAX_CONNECTIONS")));
-
-// <MAX_LOG_FILE_SIZE>
-Max_Log_File_Size->value(atoi(getValueXML("MAX_LOG_FILE_SIZE")));
-
-// <BROWSEFOLDER_CSS>
-Browsefolder_Css->value(getValueXML("BROWSEFOLDER_CSS"));
-
-// <SERVER_ADMIN>
-Server_Admin->value(getValueXML("SERVER_ADMIN"));
-
-// <GZIP_THRESHOLD>
-Gzip_Threshold->value(atoi(getValueXML("GZIP_THRESHOLD")));
-
-// <CONTROL_ENABLED>
-chrptr = xmlFile.getValue("CONTROL_ENABLED");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Control_Enabled->set();
-  Control_Admin->activate();
-  Control_Password->activate();
-  // <CONTROL_ADMIN>
-  Control_Admin->value(getValueXML("CONTROL_ADMIN"));
-  // <CONTROL_PASSWORD>
-  Control_Password->value("");
-}
-else {
-  Control_Enabled->clear();
-  Control_Admin->deactivate();
-  Control_Password->deactivate();
-  Control_Admin->value("");
-  Control_Password->value("");
-}
-
-//<ALLOW_ANONYMOUS>
-chrptr = xmlFile.getValue("ALLOW_ANONYMOUS");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Anonymous->set();
-} else {
-  Allow_Anonymous->clear();
-}
-//<ANONYMOUS_NEED_PASS>
-chrptr = xmlFile.getValue("ANONYMOUS_NEED_PASS");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Anonymous_Needs_Password->set();
-} else {
-  Anonymous_Needs_Password->clear();
-}
-if ( Allow_Anonymous->value() == 1 ){
-Anonymous_Needs_Password->activate();
-}
-else{
-Anonymous_Needs_Password->deactivate();
-}
-//<ALLOW_ASYNCHRONOUS_CMDS>
-chrptr = xmlFile.getValue("ALLOW_ASYNCHRONOUS_CMDS");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Asynchronous_Cmds->set();
-} else {
-  Allow_Asynchronous_Cmds->clear();
-}
-//<ALLOW_PIPELINING>
-chrptr = xmlFile.getValue("ALLOW_PIPELINING");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Pipelining->set();
-} else {
-  Allow_Pipelining->clear();
-}
-//<ALLOW_STORE>
-chrptr = xmlFile.getValue("ALLOW_STORE");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Store_Cmds->set();
-} else {
-  Allow_Store_Cmds->clear();
-}
-
-// End of myserver.xml file
-return 0;
-}
-
-int MainDlg::save_config() {
-  const char * filename;
-#ifndef WIN32
-const int FBSIZE = strlen(getenv("HOME")) + 40;
-char FileBuffer[FBSIZE];
-#endif
-
-// Saveing of main myserver.xml file
-
-switch(ConfType) {
-  case 1 :
-    filename = "myserver.xml";
-    break;
-#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/myserver.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/myserver.xml";
-    break;
-#endif
-  default :
-    return -1;
-    break;
-}
-
-xmlFile.close();
-
-if(xmlFile.open(filename) != 0)
-  return -1;
-
-save_myserver_core();
-
-xmlFile.save(filename);
-
-// Saveing of MIMEtypes.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "MIMEtypes.xml";
-    break;
-#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/MIMEtypes.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/MIMEtypes.xml";
-    break;
-#endif
-  default :
-    return -1;
-    break;
-}
-
-// Save the file
-if(MimeConf.save(filename))
-  return -1;
-
-// Saveing of virtualhosts.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "virtualhosts.xml";
-    break;
-#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/virtualhosts.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/virtualhosts.xml";
-    break;
-#endif
-  default :
-    return -1;
-    break;
-}
-
-// Save the file
-if(VHostConf.save(filename))
-  return -1;
-
-// End of function
-Changed = false;
-return 0;
-}
-
-int MainDlg::save_config_remote() {
-  int ret;
-MemBuf Buffer;
-
-// ======== Progress display ========
-// Say something...
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLSend_Config, " (1/3)"));
-StatusDlg->show();
-fl_wait(200);  // let fltk do its thing
-// ======== Progress display ========
-
-ret = Server.sendDisableReboot();
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// Send myserver.xml
-save_myserver_core();
-
-xmlFile.saveMemBuf(Buffer);
-
-ret = Server.sendMyserverConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLSend_Config, " (2/3)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Send MIMEtypes.xml
-ret = MimeConf.saveMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-ret = Server.sendMIMEtypesConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLSend_Config, " (3/3)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Send virtualhosts.xml
-ret = VHostConf.saveMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-ret = Server.sendVhostsConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-ret = Server.sendEnableReboot();
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// ======== Progress display ========
-fl_wait(500);  // oooo aaa effect
-StatusDlg->hide();
-// ======== Progress display ========
-
-// End of function
-Changed = false;
-return 0;
-}
-
-int MainDlg::save_myserver_core() {
-  char Buffer[256];
-int i;
-
-if(!xmlFile.getDoc()) {  // the file dose not exist so make one
-   xmlFile.newfile("MYSERVER");
-}
-
-// <LANGUAGE>
-setValueXML("LANGUAGE", Language->text());
-
-// <VERBOSITY>
-i = (int)Verbosity->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("VERBOSITY", Buffer);
-
-// <NTHREADS_STATIC>
-i = (int)Nthreads_Static->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("NTHREADS_STATIC", Buffer);
-
-// <NTHREADS_MAX>
-i = (int)Nthreads_Max->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("NTHREADS_MAX", Buffer);
-
-// <BUFFER_SIZE>
-i = (int)Buffer_Size->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("BUFFER_SIZE", Buffer);
-
-// <DEFAULT_FILENAME>
-for(i = 0; i < Default_Filename->size(); i++) {
-  setValueXML("DEFAULT_FILENAME",  Default_Filename->text(i + 1));
-}
-
-// <CONNECTION_TIMEOUT>
-i = (int)Connection_Timeout->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("CONNECTION_TIMEOUT", Buffer);
-
-// <USE_ERRORS_FILES>
-if(Use_Errors_Files->value())
-  setValueXML("USE_ERRORS_FILES", "YES");
-else
-  setValueXML("USE_ERRORS_FILES", "NO");
-
-// <MAX_CONNECTIONS>
-i = (int)Max_Connections->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("MAX_CONNECTIONS", Buffer);
-
-// <MAX_LOG_FILE_SIZE>
-i = (int)Max_Log_File_Size->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("MAX_LOG_FILE_SIZE", Buffer);
-
-// <BROWSEFOLDER_CSS>
-setValueXML("BROWSEFOLDER_CSS", Browsefolder_Css->value());
-
-// <SERVER_ADMIN>
-setValueXML("SERVER_ADMIN", Server_Admin->value());
-
-// <GZIP_THRESHOLD>
-i = (int)Gzip_Threshold->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("GZIP_THRESHOLD", Buffer);
-
-// <CONTROL_ENABLED>
-if(Control_Enabled->value() == 1) {
-  setValueXML("CONTROL_ENABLED", "YES");
-  // <CONTROL_ADMIN>
-  setValueXML("CONTROL_ADMIN", Control_Admin->value());
-  // <CONTROL_PASSWORD>
-  const char * chrptr = Control_Password->value();
-  if(chrptr[0] != '\0') {
-    char tempbuffer[32];
-    Md5 md5;
-    md5.init();
-    md5.update((const unsigned char*)chrptr, strlen(chrptr));
-    md5.end(tempbuffer);
-    setValueXML("CONTROL_PASSWORD", tempbuffer);
-    xmlFile.setAttr("MD5", "YES");
-  }
-}
-else {
-  setValueXML("CONTROL_ENABLED", "NO");
-}
-
-//<ALLOW_ANONYMOUS>
-if(Allow_Anonymous->value() == 1) {
-  setValueXML("ALLOW_ANONYMOUS", "YES");
-} else {
-  setValueXML("ALLOW_ANONYMOUS", "NO");
-}
-//<ANONYMOUS_NEED_PASS>
-if(Anonymous_Needs_Password->value() == 1) {
-  setValueXML("ANONYMOUS_NEED_PASS", "YES");
-} else {
-  setValueXML("ANONYMOUS_NEED_PASS", "NO");
-}
-//<ALLOW_ASYNCHRONOUS_CMDS>
-if(Allow_Asynchronous_Cmds->value() == 1) {
-  setValueXML("ALLOW_ASYNCHRONOUS_CMDS", "YES");
-} else {
-  setValueXML("ALLOW_ASYNCHRONOUS_CMDS", "NO");
-}
-//<ALLOW_PIPELINING>
-if(Allow_Pipelining->value() == 1) {
-  setValueXML("ALLOW_PIPELINING", "YES");
-} else {
-  setValueXML("ALLOW_PIPELINING", "NO");
-}
-//<ALLOW_STORE>
-if(Allow_Store_Cmds->value() == 1) {
-  setValueXML("ALLOW_STORE", "YES");
-} else {
-  setValueXML("ALLOW_STORE", "NO");
-}
-
-// End of myserver.xml file
-return 0;
-}
-
-void MainDlg::setDynamic(Vector & list) {
-  VHostConf.loadProtocols(list);
-VHostConf.populateProtocol(Protocol);
-}
-
-const char * MainDlg::getValueXML(const char * name) {
-  char * chrptr;
-chrptr = xmlFile.getValue((char *)name);
-if(chrptr == 0)
-  return "";
-return chrptr;
-}
-
-void MainDlg::setValueXML(const char * name, const char * value) {
-  char * chrptr;
-chrptr = xmlFile.getValue((char *)name);
-if(chrptr == 0)
-  xmlFile.addChild(name, value);
-else
-  xmlFile.setValue((char *)name, (char *)value);
-}
-
-void MainDlg::ServerLogout() {
-  Server.Logout();
-MenuLogout->deactivate();
-MenuGetConfig->deactivate();
-MenuSendConfig->deactivate();
-MenuConnections->deactivate();
-MenuReboot->deactivate();
-}
-
-int MainDlg::ServerLogin(bool stat) {
-  LoginDlg->show();
-int ret;
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait();
-  else if(o == LoginDlgOK) {ret = 0; break;}
-  else if(o == LoginDlgCancel) {ret = -1; break;}
-  else if(o == LoginDlg) {ret = -1; break;}
-}
-LoginDlg->hide();
-
-if(ret) {
-  LoginDlgPass->value("");
-  return -1;
-}
-
-if(stat) {
-  // Say something...
-  StatusDlgProgress->value(0);
-  StatusDlgProgress->label("0%");
-  StatusDlgGroup->label(LanguageXMLConnect_Server);
-  StatusDlg->show();
-  fl_wait(200);  // let fltk do its thing
-}
-
-ret = Server.Login(LoginDlgAddress->value(),
-                   (int)LoginDlgPort->value(),
-                   LoginDlgName->value(),
-                   LoginDlgPass->value());
-
-LoginDlgPass->value("");
-
-if(ret) {
-  StatusDlg->hide();
-  fl_alertcat(LanguageXMLLogin_Failed, Server.LastCode);
-  return -1;
-}
-
-MenuLogout->activate();
-MenuGetConfig->activate();
-MenuSendConfig->activate();
-MenuConnections->activate();
-MenuReboot->activate();
-
-if(stat) {
-  // Show we are done...
-  StatusDlgProgress->value(100);
-  StatusDlgProgress->label("100%");
-  fl_wait(500);  // oooo aaa effect
-  StatusDlg->hide();
-}
-
-return 0;
-}
-
-void MainDlg::ServerConnections() {
-  int ret;
-int time;
-int i;
-MemBuf MSvr;
-Vector list;
-ConnectionsDlgVr->value("");
-ConnectionsDlgList->clear();
-ConnectionsDlg->show();
-fl_wait(200);
-
-// see if we are connected by getting the vr
-ret = Server.getVersion(MSvr);
-
-if(ret) { // relogin?
-  ret = ServerLogin(false);
-  if(!ret) {
-    ret = Server.getVersion(MSvr);
-  }
-}
-
-if(ret) { // no dice
-  fl_alert(LanguageXMLCannot_Connect);
-  ConnectionsDlg->hide();
-  return;
-}
-
-// update display
-MSvr << '\0';
-ConnectionsDlgVr->value((const char *)MSvr.getBuffer());
-
-time = getTicks();
-ConnectionsDlgList->clear();
-ret = Server.getConnections(list);
-
-if(ret) {
-  fl_alertcat(LanguageXMLServer_Closed, Server.LastCode);
-  ConnectionsDlg->hide();
-  ServerLogout();
-  return;
-}
-
-list.sort();
-for(i = 0; i < list.size(); i++) {
-  ConnectionsDlgList->add(list.at(i)->Text);
-}
-
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait(1);
-  else if(o == ConnectionsDlgDone) {break; }
-  else if(o == ConnectionsDlg) {break; }
-  else if(o == ConnectionsDlgKill) {
-    i = ConnectionsDlgList->value();
-    if(i != 0) {
-      ret = Server.sendKillConnection(list.at(i - 1));
-      if(ret) {
-        fl_alertcat(LanguageXMLServer_Closed, Server.LastCode);
-        ServerLogout();
-        break;
-      } // if
-      // A cheap trick
-      time = (int)getTicks() - (int)ConnectionsDlgRate->value() * 2000;
-    } // if
-  } // else if
-
-  if((int)(getTicks() - time) > (int)ConnectionsDlgRate->value() * 1000) {
-    time = getTicks();
-    ConnectionsDlgList->clear();
-    ret = Server.getConnections(list);
-
-    if(ret) {
-      fl_alertcat(LanguageXMLServer_Closed, Server.LastCode);
-      ServerLogout();
-      break;
-    } // if
-
-    list.sort();
-    for(i = 0; i < list.size(); i++) {
-      ConnectionsDlgList->add(list.at(i)->Text);
-    } // for
-  } // if
-} // for
-
-ConnectionsDlg->hide();
-}
-
-char * MainDlg::regex_input(const char * capt, bool & reg) {
-  fl_beep(FL_BEEP_QUESTION);
-RegaskDlgInput->value("");
-RegaskDlgInput->label(capt);
-RegaskDlgRegex->value(false);
-RegaskDlg->hotspot(RegaskDlgCancel);
-RegaskDlg->show();
-int ret;
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait();
-  else if(o == RegaskDlgOK) {ret = 0; break;}
-  else if(o == RegaskDlgCancel) {ret = -1; break;}
-  else if(o == RegaskDlg) {ret = -1; break;}
-}
-RegaskDlg->hide();
-
-if(ret || strcmp(RegaskDlgInput->value(), "") == 0) {
-  return NULL;
-}
-  
-reg = RegaskDlgRegex->value();
-return (char *)RegaskDlgInput->value();
-}
-
-void MainDlg::fl_alertcat(const char * c1, const char * c2) {
-  char temp[strlen(c1) + strlen(c2)];
-strncpy(temp, c1, (strlen(c1) + strlen(c2)));
-strncat(temp, c2, (strlen(c1) + strlen(c2) + 1));
-fl_alert(temp);
-}
-
-void MainDlg::fl_wait(int len) {
-  int time = (int)getTicks();
-while((int)(getTicks() - time) < len) {
-  Fl::wait(0);
-}
-}
-
-const char * MainDlg::mystrcat(const char * a, const char * b) {
-  static char temp[255];
-strncpy(temp, a, 255);
-strncat(temp, b, 255);
-return temp;
-}
diff --git a/misc/control/control/fltkconfig.fd b/misc/control/control/fltkconfig.fd
deleted file mode 100644
index baa8114..0000000
--- a/misc/control/control/fltkconfig.fd
+++ /dev/null
@@ -1,2236 +0,0 @@
-# data file for the Fltk User Interface Designer (fluid)
-version 1.0108 
-i18n_type 1 
-i18n_include "language.h" 
-i18n_function ctrl_gettext 
-header_name {.h} 
-code_name {.cpp}
-class MainDlg {open
-} {
-  Function {make_window()} {open
-  } {
-    Fl_Window ConfDlg {
-      label {MyServer Configure}
-      callback {if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-    ConfDlg->hide();
-  }
-}
-else {
-  ConfDlg->hide();
-}} open
-      xywh {583 249 550 360} type Double visible
-    } {
-      Fl_Menu_Bar {} {
-        xywh {0 0 550 25}
-      } {
-        Submenu {} {
-          label {&File} open
-          xywh {0 0 100 20}
-        } {
-          MenuItem {} {
-            label {&Open...}
-            callback {int ret;
-if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-    ret = ask_type();
-    if(ret == -1) {
-      ret = 0;
-    }
-    else {
-      ConfType = ret;
-      ret = load_config();
-    }
-  }
-}
-else {
-  ret = ask_type();
-  if(ret == -1) {
-    ret = 0;
-  }
-  else {
-    ConfType = ret;
-    ret = load_config();
-  }
-}
-
-if(ret) {
-  fl_alert(LanguageXMLNot_Found);
-}}
-            xywh {0 0 100 20}
-          }
-          MenuItem {} {
-            label {&Save...}
-            callback {int i = ask_type();
-if(i != -1) {
-  ConfType = i;
-  i = save_config();
-  if(i) {
-    fl_alert(LanguageXMLNot_Save);
-  }
-}}
-            xywh {0 0 100 20}
-          }
-          MenuItem {} {
-            label {&Revert}
-            callback {if(fl_choice(LanguageXMLReload_Prev, LanguageXMLNo, LanguageXMLYes, NULL)) {
-  load_config();
-}}
-            xywh {0 0 100 20}
-          }
-          Submenu {} {
-            label Run open
-            xywh {0 0 100 20}
-          } {
-            MenuItem {} {
-              label {as Console}
-              callback {RunAsConsole();}
-              xywh {0 0 100 20}
-            }
-            MenuItem {} {
-              label {as Service}
-              callback {RunAsService();}
-              xywh {0 0 100 20}
-            }
-          }
-          Submenu {} {
-            label Stop open
-            xywh {0 0 100 20}
-          } {
-            MenuItem {} {
-              label Console
-              callback {StopConsole();}
-              xywh {0 0 100 20}
-            }
-            MenuItem {} {
-              label Service
-              callback {StopService();}
-              xywh {0 0 100 20}
-            }
-          }
-          MenuItem {} {
-            label {&Quit}
-            callback {if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-    ConfDlg->hide();
-  }
-}
-else {
-  ConfDlg->hide();
-}}
-            xywh {0 0 100 20}
-          }
-        }
-        Submenu {} {
-          label {Ser&vice} open
-          xywh {0 0 100 20}
-        } {
-          MenuItem {} {
-            label {Install Service}
-            callback {InstallService();}
-            xywh {0 0 100 20}
-          }
-          MenuItem {} {
-            label {Remove Service}
-            callback {RemoveService();}
-            xywh {0 0 100 20}
-          }
-        }
-        Submenu {} {
-          label {Re&mote} open
-          xywh {0 0 100 20}
-        } {
-          MenuItem {} {
-            label {Login...}
-            callback {ServerLogin(true);}
-            xywh {0 0 100 20}
-          }
-          MenuItem MenuLogout {
-            label Logout
-            callback {ServerLogout();}
-            xywh {0 0 100 20} deactivate
-          }
-          MenuItem MenuGetConfig {
-            label {Get Config}
-            callback {int ret;
-if(Changed) {
-  if(fl_choice(LanguageXMLLast_Change, LanguageXMLNo, LanguageXMLYes, NULL)) {
-
-    ret = load_config_remote();
-
-    if(ret) {
-      ret = ServerLogin(false);
-      if(!ret) {
-        ret = load_config_remote();
-      }
-    }
-
-    if(ret == -1) {
-      fl_alertcat(LanguageXMLDownload_Failed, Server.LastCode);
-      ServerLogout();
-    }
-    else if(ret) {
-      fl_alert(LanguageXMLNot_Found);
-    }
-  }
-}
-else {
-
-  ret = load_config_remote();
-
-  if(ret) {
-    ret = ServerLogin(false);
-    if(!ret) {
-      ret = load_config_remote();   
-    }
-  }
-
-  if(ret == -1) {
-    fl_alertcat(LanguageXMLDownload_Failed, Server.LastCode);
-    ServerLogout();
-  }
-  else if(ret) {
-    fl_alert(LanguageXMLNot_Found);
-  }
-}}
-            xywh {0 0 100 20} deactivate
-          }
-          MenuItem MenuSendConfig {
-            label {Send Config}
-            callback {int ret;
-ret = fl_choice(LanguageXMLKill_All, LanguageXMLNo, LanguageXMLYes, NULL);
-if(ret) {
-
-  ret = save_config_remote();
-
-  if(ret) {
-    ret = ServerLogin(false);
-    if(!ret) {
-      ret = save_config_remote();
-    }
-  }
-
-  if(ret == -1) {
-    fl_alertcat(LanguageXMLUpload_Failed, Server.LastCode);
-  }
-  else if(ret) {
-    fl_alert(LanguageXMLNot_Save);
-  }
-}
-ServerLogout();}
-            xywh {0 0 100 20} deactivate
-          }
-          MenuItem MenuConnections {
-            label {Connections...}
-            callback {ServerConnections();}
-            xywh {0 0 100 20} deactivate
-          }
-          MenuItem MenuReboot {
-            label {Reboot...}
-            callback {int ret;
-ret = fl_choice(LanguageXMLKill_All, LanguageXMLNo, LanguageXMLYes, NULL);
-if(ret) {
-  ret = Server.sendReboot();
-  
-  if(ret) {
-    ret = ServerLogin(false);
-    if(!ret) {
-      ret = Server.sendReboot();
-    }
-  }
-
-  if(ret) {
-    fl_alert(LanguageXMLReboot_Failed);
-  }
-
-  ServerLogout();
-}}
-            xywh {0 0 100 20} deactivate
-          }
-        }
-        Submenu {} {
-          label {&Help} open
-          xywh {0 0 100 20}
-        } {
-          MenuItem {} {
-            label {&About}
-            callback {AboutDlg->show();}
-            xywh {0 0 100 20}
-          }
-        }
-      }
-      Fl_Tabs {} {open
-        xywh {0 25 635 335}
-      } {
-        Fl_Group {} {
-          label System selected
-          xywh {0 50 550 310}
-        } {
-          Fl_Value_Input Buffer_Size {
-            label {Memory buffer (in bytes):}
-            callback {Changed = true;}
-            xywh {295 60 115 25} maximum 5.24288e+06 step 1
-          }
-          Fl_Choice Verbosity {
-            label {Verbosity level:}
-            callback {Changed = true;}
-            xywh {295 90 115 25} down_box BORDER_BOX when 1
-          } {
-            MenuItem {} {
-              label None
-              xywh {5 5 100 20}
-            }
-            MenuItem {} {
-              label Normal
-              xywh {5 5 100 20}
-            }
-            MenuItem {} {
-              label Higher
-              xywh {5 5 100 20}
-            }
-            MenuItem {} {
-              label Highest
-              xywh {5 5 100 20}
-            }
-          }
-          Fl_Value_Input Max_Log_File_Size {
-            label {Max log file size (in bytes):}
-            callback {Changed = true;}
-            xywh {295 120 115 25} maximum 5.24288e+07 step 1
-          }
-          Fl_Value_Input Nthreads_Static {
-            label {Always active threads:}
-            callback {Changed = true;}
-            xywh {295 150 115 30} maximum 1000 step 1
-          }
-          Fl_Value_Input Nthreads_Max {
-            label {Maximum number of threads:}
-            callback {Changed = true;}
-            xywh {295 185 115 25} maximum 1000 step 1
-          }
-          Fl_Choice Language {
-            label {Language:}
-            callback {Changed = true;} open
-            xywh {295 215 115 25} down_box BORDER_BOX when 1
-          } {}
-        }
-        Fl_Group {} {
-          label Server
-          xywh {0 50 550 310} hide
-        } {
-          Fl_Value_Input Connection_Timeout {
-            label {Connection time-out (in sec):}
-            callback {Changed = true;}
-            xywh {295 60 115 25} maximum 3600 step 1
-          }
-          Fl_Value_Input Max_Connections {
-            label {Max connections:}
-            callback {Changed = true;}
-            xywh {295 90 115 25} maximum 5.24288e+06 step 1
-          }
-          Fl_Value_Input Gzip_Threshold {
-            label {Gzip compression threshold (in bytes):}
-            callback {Changed = true;}
-            xywh {295 120 115 25} maximum 5.24288e+06 step 1
-          }
-          Fl_Input Browsefolder_Css {
-            label {Stylesheet:}
-            callback {Changed = true;}
-            xywh {295 150 115 25} when 1
-          }
-          Fl_Button {} {
-            label {Browse...}
-            callback {char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  Changed = true;
-  Browsefolder_Css->value(chrptr);
-}}
-            xywh {420 150 85 25}
-          }
-          Fl_Check_Button Use_Errors_Files {
-            label {Personalized error pages:}
-            callback {Changed = true;}
-            xywh {295 180 25 25} down_box DOWN_BOX align 4 when 1
-          }
-          Fl_Group {} {
-            label {Default file names:} open
-            tooltip {Default file to send in a directory when none is specified} xywh {115 205 345 145} box ENGRAVED_BOX align 17
-          } {
-            Fl_Browser Default_Filename {
-              xywh {135 230 195 105} type Hold
-            }
-            Fl_Button {} {
-              label {Add...}
-              callback {char * val;
-val = (char *)fl_input(LanguageXMLEnter_Default);
-if(val != 0) {
-  Changed = true;
-  Default_Filename->add(val);
-}}
-              xywh {350 230 85 25}
-            }
-            Fl_Button {} {
-              label Remove
-              callback {if(Default_Filename->value() != 0) {
-  Changed = true;
-  Default_Filename->remove(Default_Filename->value());
-}}
-              xywh {350 265 85 25}
-            }
-          }
-        }
-        Fl_Group {} {
-          label MIME
-          xywh {0 50 550 310} hide
-        } {
-          Fl_Group {} {open
-            xywh {10 60 530 290} box ENGRAVED_FRAME
-          } {
-            Fl_Group {} {
-              label {Extension:} open
-              xywh {20 70 195 270} box ENGRAVED_FRAME align 17
-            } {
-              Fl_Browser Ext {
-                callback {int val = Ext->value();
-if(val != 0) {
-  val -= 1;
-  
-  Cmd->value(MimeConf.getCmd(val));
-  
-  if(Cmd->value() >= 2 && Cmd->value() <= 4) {
-  }
-
-  Mime->value(MimeConf.getType(val));
-
-  Manager->value(MimeConf.getManager(val));
-}}
-                xywh {31 95 170 190} type Hold
-              }
-              Fl_Button {} {
-                label {Add...}
-                callback {char * val;
-int i;
-val = (char *)fl_input(LanguageXMLEnter_Extension);
-if(val != 0) {
-  Changed = true;
-  i = MimeConf.addExt(val);
-  MimeConf.populateExt(Ext);
-  Ext->value(i + 1);
-
-  Cmd->value(MimeConf.getCmd(i));
-  
-  
-  Mime->value(MimeConf.getType(i));
-
-  Manager->value(MimeConf.getManager(i));
-}}
-                xywh {30 300 80 25}
-              }
-              Fl_Button {} {
-                label Remove
-                callback {int val;
-val = Ext->value();
-if(val != 0) {
-  Changed = true;
-  val--;
-  MimeConf.removeExt(val);
-  MimeConf.populateExt(Ext);
-}}
-                xywh {120 300 80 25}
-              }
-            }
-            Fl_Choice Mime {
-              label {MIME Type:}
-              callback {int val = Ext->value();
-if(val != 0) {
-  val--;
-  Changed = true;
-  MimeConf.setType(val, Mime->value());
-}} open
-              xywh {310 95 220 25} down_box BORDER_BOX when 1
-            } {}
-            Fl_Button {} {
-              label {Add...}
-              callback {char * val;
-int i, ret;
-val = (char *)fl_input(LanguageXMLEnter_MIME);
-if(val != 0) {
-  Changed = true;
-  i = MimeConf.addMime(val);
-  MimeConf.populateMime(Mime);
-  Mime->value(i);
-  ret = Ext->value();
-  if(ret != 0) {
-    ret--;
-    MimeConf.setType(ret, i);
-  }
-}}
-              xywh {310 125 90 25}
-            }
-            Fl_Choice Cmd {
-              label {Action:}
-              callback {int val = Cmd->value();
-int val2 = Ext->value();
-if(val >= 2 && val <= 4) {
-}
-else {
-  if(val2 != 0)
-    MimeConf.setManager(val2 - 1, NONE);
-  Manager->value(NONE);
-}
-
-if(val2 != 0) {
-  val2--;
-  MimeConf.setCmd(val2, val);
-  Changed = true;
-}} open
-              xywh {310 165 220 25} down_box BORDER_BOX when 1
-            } {
-              MenuItem {} {
-                label {Send the file}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {URL link}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Run as CGI}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Run as FastCGI}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Run as SCGI}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Run as ISAPI}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Run as MSCGI}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Run as WINCGI}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label Execute
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Execute as an ISAPI module}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Execute self contained FastCGI}
-                xywh {10 10 100 20}
-              }
-              MenuItem {} {
-                label {Run self contained SCGI}
-                xywh {10 10 100 20}
-              }
-            }
-            Fl_Input Manager {
-              label {Manager:}
-              callback {int val = Ext->value();
-if(val != 0) {
-  val--;
-  MimeConf.setManager(val, Manager->value());
-  Changed = true;
-}}
-              xywh {310 205 220 25}
-            }
-            Fl_Button ManagerButton {
-              label {Browse...}
-              callback {int val = Ext->value();
-char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  if(val != 0) {
-    val--;
-    MimeConf.setManager(val, chrptr);
-    Manager->value(chrptr);
-    Changed = true;
-  }
-}}
-              xywh {310 235 90 25}
-            }
-          }
-        }
-        Fl_Group {} {
-          label Hosts
-          xywh {0 50 635 310} hide
-        } {
-          Fl_Group {} {
-            xywh {10 60 530 45} box ENGRAVED_FRAME
-          } {
-            Fl_Choice Name {
-              label {Name:}
-              callback {int i = Name->value();
-VHostConf.populateHost(i, Host);
-VHostConf.populateIp(i, Ip);
-Port->value(VHostConf.getPort(i));
-Protocol->value(VHostConf.getProtocol(i));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(i));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(i));
-Ssl_Password->value(VHostConf.getSsl_Password(i));
-Docroot->value(VHostConf.getDocroot(i));
-Sysfolder->value(VHostConf.getSysfolder(i));
-Accesseslog->value(VHostConf.getAccesseslog(i));
-Warninglog->value(VHostConf.getWarninglog(i));
-Allow_CGI->value(VHostConf.getService(i, ALLOW_CGI));
-Allow_ISAPI->value(VHostConf.getService(i, ALLOW_ISAPI));
-Allow_MSCGI->value(VHostConf.getService(i, ALLOW_MSCGI));
-Allow_WINCGI->value(VHostConf.getService(i, ALLOW_WINCGI));
-Allow_FASTCGI->value(VHostConf.getService(i, ALLOW_FASTCGI));
-Allow_SCGI->value(VHostConf.getService(i, ALLOW_SCGI));
-Allow_SEND_LINK->value(VHostConf.getService(i, ALLOW_SEND_LINK));
-Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(i, ALLOW_EXTERNAL_COMMANDS));
-Allow_SEND_FILE->value(VHostConf.getService(i, ALLOW_SEND_FILE));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}} open
-              xywh {75 70 275 25} down_box BORDER_BOX when 1
-            } {}
-            Fl_Button {} {
-              label {Add...}
-              callback {char * val;
-int i;
-val = (char *)fl_input(LanguageXMLEnter_Name);
-if(val != 0) {
-  Changed = true;
-  i = VHostConf.addName(val);
-  VHostConf.populateName(Name);
-  Name->value(i);
-  VHostConf.populateHost(i, Host);
-  VHostConf.populateIp(i, Ip);
-  Port->value(VHostConf.getPort(i));
-  Protocol->value(VHostConf.getProtocol(i));
-  Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(i));
-  Ssl_Certificate->value(VHostConf.getSsl_Certificate(i));
-  Ssl_Password->value(VHostConf.getSsl_Password(i));
-  Docroot->value(VHostConf.getDocroot(i));
-  Sysfolder->value(VHostConf.getSysfolder(i));
-  Accesseslog->value(VHostConf.getAccesseslog(i));
-  Warninglog->value(VHostConf.getWarninglog(i));
-  Allow_CGI->value(VHostConf.getService(i, ALLOW_CGI));
-  Allow_ISAPI->value(VHostConf.getService(i, ALLOW_ISAPI));
-  Allow_MSCGI->value(VHostConf.getService(i, ALLOW_MSCGI));
-  Allow_WINCGI->value(VHostConf.getService(i, ALLOW_WINCGI));
-  Allow_FASTCGI->value(VHostConf.getService(i, ALLOW_FASTCGI));
-  Allow_SCGI->value(VHostConf.getService(i, ALLOW_SCGI));
-  Allow_SEND_LINK->value(VHostConf.getService(i, ALLOW_SEND_LINK));
-  Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(i, ALLOW_EXTERNAL_COMMANDS));
-  Allow_SEND_FILE->value(VHostConf.getService(i, ALLOW_SEND_FILE));
-  i = Protocol->value();
-  if(i != 1 && i != 3) {
-    Ssl_Privatekey->deactivate();
-    Ssl_Certificate->deactivate();
-    Ssl_Password->deactivate();
-    SslButton1->deactivate();
-    SslButton2->deactivate();
-  }
-  else {
-    Ssl_Privatekey->activate();
-    Ssl_Certificate->activate();
-    Ssl_Password->activate();
-    SslButton1->activate();
-    SslButton2->activate();
-  }
-}}
-              xywh {360 70 80 25}
-            }
-            Fl_Button {} {
-              label Remove
-              callback {Changed = true;
-int i = Name->value();
-VHostConf.removeName(i);
-i = 0;
-VHostConf.populateName(Name);
-Name->value(i);
-VHostConf.populateHost(i, Host);
-VHostConf.populateIp(i, Ip);
-Port->value(VHostConf.getPort(i));
-Protocol->value(VHostConf.getProtocol(i));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(i));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(i));
-Ssl_Password->value(VHostConf.getSsl_Password(i));
-Docroot->value(VHostConf.getDocroot(i));
-Sysfolder->value(VHostConf.getSysfolder(i));
-Accesseslog->value(VHostConf.getAccesseslog(i));
-Warninglog->value(VHostConf.getWarninglog(i));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}}
-              xywh {450 70 80 25}
-            }
-          }
-          Fl_Group {} {
-            xywh {10 110 625 240} box ENGRAVED_FRAME
-          } {
-            Fl_Tabs {} {
-              xywh {19 120 616 225}
-            } {
-              Fl_Group {} {
-                label Protocol
-                xywh {20 145 510 195} hide
-              } {
-                Fl_Choice Protocol {
-                  label {Protocol:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setProtocol(i, Protocol->value());
-int pval = Protocol->value();
-if(pval != 1 && pval != 3) {
-  VHostConf.setSsl_Privatekey(i, EMPTY);
-  VHostConf.setSsl_Certificate(i, EMPTY);
-  VHostConf.setSsl_Password(i, EMPTY);
-  Ssl_Privatekey->value(EMPTY);
-  Ssl_Certificate->value(EMPTY);
-  Ssl_Password->value(EMPTY);
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}
-
-// set default vals
-switch(pval) {
-  case 0 :
-    Port->value(80);
-    VHostConf.setPort(i, 80);
-    break;
-  case 1 :
-    Port->value(443);
-    VHostConf.setPort(i, 443);
-    break;
-  case 2 :
-    Port->value(21);
-    VHostConf.setPort(i, 21);
-    break;
-  case 3 :
-    Port->value(270);
-    VHostConf.setPort(i, 270);
-    break;
-  default :
-    break;
-}}
-                  xywh {180 155 215 25} down_box BORDER_BOX when 1
-                } {
-                  MenuItem {} {
-                    label HTTP
-                    xywh {5 5 100 20}
-                  }
-                  MenuItem {} {
-                    label HTTPS
-                    xywh {5 5 100 20}
-                  }
-                  MenuItem {} {
-                    label FTP
-                    xywh {5 5 100 20}
-                  }
-                  MenuItem {} {
-                    label CONTROL
-                    xywh {0 0 100 20}
-                  }
-                }
-                Fl_Input Ssl_Privatekey {
-                  label {SSL private key:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setSsl_Privatekey(i, Ssl_Privatekey->value());}
-                  xywh {180 185 215 25} when 1 deactivate
-                }
-                Fl_Input Ssl_Certificate {
-                  label {SSL certificate:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setSsl_Certificate(i, Ssl_Certificate->value());}
-                  xywh {180 215 215 25} when 1 deactivate
-                }
-                Fl_Input Ssl_Password {
-                  label {SSL password:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setSsl_Password(i, Ssl_Password->value());}
-                  xywh {180 245 215 25} type Secret when 1 deactivate
-                }
-                Fl_Button SslButton1 {
-                  label {Browse...}
-                  callback {char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setSsl_Privatekey(i, chrptr);
-  Ssl_Privatekey->value(chrptr);
-}}
-                  xywh {405 185 85 25} deactivate
-                }
-                Fl_Button SslButton2 {
-                  label {Browse...}
-                  callback {char * chrptr = fl_file_chooser("", "", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setSsl_Certificate(i, chrptr);
-  Ssl_Certificate->value(chrptr);
-}}
-                  xywh {405 215 85 25} deactivate
-                }
-              }
-              Fl_Group {} {
-                label Arpa
-                xywh {20 145 510 195} hide
-              } {
-                Fl_Browser Host {
-                  label Host
-                  xywh {30 165 170 135} type Hold align 1
-                }
-                Fl_Browser Ip {
-                  label IP
-                  xywh {210 165 170 135} type Hold align 1
-                }
-                Fl_Button {} {
-                  label {Add...}
-                  callback {char * val;
-int NameNo, i;
-bool reg = false;
-val = (char *)regex_input(LanguageXMLEnter_Host, reg);
-if(val != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  i = VHostConf.addHost(NameNo, val, reg);
-  VHostConf.populateHost(NameNo, Host);
-  Host->value(i + 1);
-}}
-                  xywh {30 305 80 25}
-                }
-                Fl_Button {} {
-                  label Remove
-                  callback {int i, NameNo;
-i = Host->value();
-if(i != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  VHostConf.removeHost(NameNo, i - 1);
-  VHostConf.populateHost(NameNo, Host);
-}}
-                  xywh {120 305 80 25}
-                }
-                Fl_Button {} {
-                  label {Add...}
-                  callback {char * val;
-int NameNo, i;
-bool reg;
-val = (char *)regex_input(LanguageXMLEnter_Ip, reg);
-if(val != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  i = VHostConf.addIp(NameNo, val, reg);
-  VHostConf.populateIp(NameNo, Ip);
-  Ip->value(i + 1);
-}}
-                  xywh {210 305 80 25}
-                }
-                Fl_Button {} {
-                  label Remove
-                  callback {int i, NameNo;
-i = Ip->value();
-if(i != 0) {
-  Changed = true;
-  NameNo = Name->value();
-  VHostConf.removeIp(NameNo, i - 1);
-  VHostConf.populateIp(NameNo, Ip);
-}}
-                  xywh {300 305 80 25}
-                }
-                Fl_Value_Input Port {
-                  label {Port:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setPort(i, (int)Port->value());}
-                  xywh {435 165 65 25} maximum 10240 step 1
-                }
-              }
-              Fl_Group {} {
-                label {HTTP Services}
-                xywh {25 140 510 195} hide
-              } {
-                Fl_Box {} {
-                  label {Enable:}
-                  xywh {45 150 115 25} align 20
-                }
-                Fl_Check_Button Allow_CGI {
-                  label CGI
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_CGI, Allow_CGI->value());}
-                  xywh {65 175 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_ISAPI {
-                  label ISAPI
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_ISAPI, Allow_ISAPI->value());}
-                  xywh {65 195 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_MSCGI {
-                  label MSCGI
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_MSCGI, Allow_MSCGI->value());}
-                  xywh {65 215 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_WINCGI {
-                  label WINCGI
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_WINCGI, Allow_WINCGI->value());}
-                  xywh {65 235 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_FASTCGI {
-                  label FASTCGI
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_FASTCGI, Allow_FASTCGI->value());}
-                  xywh {65 255 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_SCGI {
-                  label SCGI
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_SCGI, Allow_SCGI->value());}
-                  xywh {235 175 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_SEND_LINK {
-                  label {SEND LINK}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_SEND_LINK, Allow_SEND_LINK->value());}
-                  xywh {235 195 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_EXTERNAL_COMMANDS {
-                  label {EXTERNAL COMMANDS}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_EXTERNAL_COMMANDS, Allow_EXTERNAL_COMMANDS->value());}
-                  xywh {235 215 20 25} down_box DOWN_BOX align 8 when 1
-                }
-                Fl_Check_Button Allow_SEND_FILE {
-                  label {SEND FILE}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setService(i, ALLOW_SEND_FILE, Allow_SEND_FILE->value());}
-                  xywh {235 235 20 25} down_box DOWN_BOX align 8 when 1
-                }
-              }
-              Fl_Group {} {
-                label Directories
-                xywh {20 145 510 195} hide
-              } {
-                Fl_Input Docroot {
-                  label {Document root:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setDocroot(i, Docroot->value());}
-                  xywh {180 155 215 25} when 1
-                }
-                Fl_Input Sysfolder {
-                  label {System folder:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setSysfolder(i, Sysfolder->value());}
-                  xywh {180 185 215 25} when 1
-                }
-                Fl_Button {} {
-                  label {Browse...}
-                  callback {char * chrptr = fl_dir_chooser("", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setDocroot(i, chrptr);
-  Docroot->value(chrptr);
-}}
-                  xywh {405 155 85 25}
-                }
-                Fl_Button {} {
-                  label {Browse...}
-                  callback {char * chrptr = fl_dir_chooser("", "");
-if(chrptr != 0) {
-  Changed = true;
-  int i = Name->value();
-  VHostConf.setSysfolder(i, chrptr);
-  Sysfolder->value(chrptr);
-}}
-                  xywh {405 185 85 25}
-                }
-              }
-              Fl_Group {} {
-                label Logs
-                xywh {20 145 510 195}
-              } {
-                Fl_Input Accesseslog {
-                  label {Accesses log file:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setAccesseslog(i, Accesseslog->value());}
-                  xywh {180 155 215 25} when 1
-                }
-                Fl_Input Warninglog {
-                  label {Warning log file:}
-                  callback {Changed = true;
-int i = Name->value();
-VHostConf.setWarninglog(i, Warninglog->value());}
-                  xywh {180 185 215 25} when 1
-                }
-              }
-            }
-          }
-        }
-        Fl_Group {} {
-          label Administrator
-          xywh {0 50 550 310} hide
-        } {
-          Fl_Input Server_Admin {
-            label {Administrator e-mail:}
-            callback {Changed = true;}
-            xywh {295 60 190 25} when 1
-          }
-          Fl_Input Control_Admin {
-            label {Administrator user name:}
-            callback {Changed = true;}
-            xywh {295 90 190 25} when 1 deactivate
-          }
-          Fl_Input Control_Password {
-            label {Administrator password:}
-            callback {Changed = true;}
-            xywh {295 120 190 25} type Secret when 1 deactivate
-          }
-          Fl_Check_Button Control_Enabled {
-            label {Enable control protocol:}
-            callback {Changed = true;
-if(Control_Enabled->value() == 1) {
-  Control_Admin->activate();
-  Control_Password->activate();
-}
-else {
-  Control_Admin->deactivate();
-  Control_Password->deactivate();
-}}
-            xywh {295 150 25 25} down_box DOWN_BOX align 4 when 1
-          }
-        }
-        Fl_Group {} {
-          label {FTP Services} open
-          xywh {0 56 549 293} hide
-        } {
-          Fl_Box {} {
-            label {Enable:}
-            xywh {3 59 115 25} align 20
-          }
-          Fl_Check_Button Allow_Anonymous {
-            label {Anonymous Access}
-            callback {Changed = true;
-if ( Allow_Anonymous->value() == 1 ){
-Anonymous_Needs_Password->activate();
-}
-else{
-Anonymous_Needs_Password->deactivate();
-}}
-            xywh {3 97 20 25} down_box DOWN_BOX align 8
-          }
-          Fl_Check_Button Anonymous_Needs_Password {
-            label {Anonymous Needs Password}
-            callback {Changed=true;}
-            xywh {269 97 20 24} down_box DOWN_BOX align 8
-          }
-          Fl_Check_Button Allow_Asynchronous_Cmds {
-            label {Asynchronous Commands}
-            callback {Changed=true;}
-            xywh {3 161 19 22} down_box DOWN_BOX align 8
-          }
-          Fl_Check_Button Allow_Pipelining {
-            label Pipelining
-            callback {Changed=true;}
-            xywh {3 222 21 22} down_box DOWN_BOX align 8
-          }
-          Fl_Check_Button Allow_Store_Cmds {
-            label {Write Commands}
-            callback {Changed=true;}
-            xywh {3 284 20 26} down_box DOWN_BOX align 8
-          }
-        }
-      }
-    }
-    code {// Set FLTK function's text
-  fl_ok = ctrl_gettext("OK");
-  fl_cancel = ctrl_gettext("Cancel");} {}
-  }
-  Function {make_type()} {} {
-    Fl_Window ConfTypeDlg {
-      label {Chose Location} open
-      xywh {532 584 303 152} type Double align 0 hide modal
-    } {
-      Fl_Group {} {
-        label {Chose configuration file location:} open
-        xywh {0 0 305 100} align 17
-      } {
-        Fl_Round_Button ConfTypeDlgLocal {
-          label Local
-          callback {ConfType = 1;}
-          tooltip {Configuration files located in current directory} xywh {105 25 70 25} type Radio down_box ROUND_DOWN_BOX
-        }
-        Fl_Round_Button ConfTypeDlgUser {
-          label User
-          callback {ConfType = 2;}
-          tooltip {Configuration files located in ~/.myserver} xywh {105 45 70 25} type Radio down_box ROUND_DOWN_BOX
-        }
-        Fl_Round_Button ConfTypeDlgGlobal {
-          label Global
-          callback {ConfType = 3;}
-          tooltip {Configuration files located in /etc/myserver} xywh {105 65 70 25} type Radio down_box ROUND_DOWN_BOX
-        }
-      }
-      Fl_Return_Button ConfTypeDlgOK {
-        label OK
-        xywh {65 108 65 30}
-      }
-      Fl_Button ConfTypeDlgCancel {
-        label Cancel
-        xywh {165 110 65 30}
-      }
-    }
-  }
-  Function {make_about()} {} {
-    Fl_Window AboutDlg {
-      label About open
-      xywh {320 453 595 115} type Double hide modal
-    } {
-      Fl_Group {} {open
-        image {../binaries/web/logo.png} xywh {15 20 155 80} align 21
-      } {}
-      Fl_Text_Display AboutText {
-        xywh {185 10 305 95} align 0
-      }
-      Fl_Return_Button {} {
-        label OK
-        callback {AboutDlg->hide();}
-        xywh {505 10 75 25}
-      }
-    }
-    code {Fl_Text_Buffer * atext = new Fl_Text_Buffer;
-atext->text(LanguageXMLAbout_Text);
-AboutText->buffer(atext);} {}
-  }
-  Function {make_login()} {} {
-    Fl_Window LoginDlg {
-      label {Remote Login} open
-      xywh {328 239 605 120} type Double hide modal
-    } {
-      Fl_Input LoginDlgAddress {
-        label {Address:}
-        xywh {90 20 275 25}
-      }
-      Fl_Value_Input LoginDlgPort {
-        label {Port:}
-        xywh {420 20 70 25} maximum 10240 step 1 value 270
-      }
-      Fl_Input LoginDlgName {
-        label {Login name:}
-        xywh {185 50 180 25}
-      }
-      Fl_Input LoginDlgPass {
-        label {Login password:}
-        xywh {185 80 180 25} type Secret
-      }
-      Fl_Return_Button LoginDlgOK {
-        label OK
-        xywh {510 20 75 25}
-      }
-      Fl_Button LoginDlgCancel {
-        label Cancel
-        xywh {510 55 75 25}
-      }
-    }
-  }
-  Function {make_status()} {} {
-    Fl_Window StatusDlg {
-      label Status open
-      xywh {372 471 275 100} type Double hide modal
-    } {
-      Fl_Group StatusDlgGroup {open
-        xywh {10 15 260 65} align 17
-      } {
-        Fl_Progress StatusDlgProgress {
-          xywh {25 50 230 25} selection_color 229
-          code0 {StatusDlgProgress->maximum(100);}
-          code1 {StatusDlgProgress->minimum(0);}
-          code2 {Server.setCallback(ProgressCallback, (void *)StatusDlgProgress);}
-        }
-      }
-    }
-  }
-  Function {make_connections()} {} {
-    Fl_Window ConnectionsDlg {
-      label Connections open
-      xywh {269 258 488 341} type Double hide modal
-    } {
-      Fl_Output ConnectionsDlgVr {
-        label {Server:}
-        xywh {65 15 140 25}
-      }
-      Fl_Browser ConnectionsDlgList {
-        label {Connections (ID - IP - Port - LocalIP - LocalPort - Login - PWord)}
-        xywh {10 60 470 235} type Hold align 1
-      }
-      Fl_Counter ConnectionsDlgRate {
-        label {Update rate:}
-        xywh {95 305 85 25} type Simple align 4 minimum 1 maximum 30 step 1 value 10
-      }
-      Fl_Button ConnectionsDlgKill {
-        label {Kill connection}
-        xywh {195 305 130 25}
-      }
-      Fl_Button ConnectionsDlgDone {
-        label Done
-        xywh {340 305 130 25}
-      }
-    }
-  }
-  Function {make_regask()} {} {
-    Fl_Window RegaskDlg {open
-      xywh {462 30 425 110} type Double hide modal
-    } {
-      Fl_Input RegaskDlgInput {
-        xywh {75 35 340 25} align 5
-      }
-      Fl_Button RegaskDlgCancel {
-        label Cancel
-        xywh {340 70 75 25}
-      }
-      Fl_Return_Button RegaskDlgOK {
-        label OK
-        xywh {250 70 75 25}
-      }
-      Fl_Check_Button RegaskDlgRegex {
-        label Regex
-        xywh {75 65 95 25} down_box DOWN_BOX
-      }
-      Fl_Box {} {
-        xywh {10 10 55 55} box THIN_UP_BOX color 255 labelfont 9 labelsize 43 labelcolor 4
-        code0 {o->label("?");}
-      }
-    }
-  }
-  Function {ask_type()} {return_type int
-  } {
-    code {\#ifdef WIN32
-return 1;
-\#else
-ConfTypeDlg->show();
-int ret;
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait();
-  else if(o == ConfTypeDlgOK) {ret = 0; break;}
-  else if(o == ConfTypeDlgCancel) {ret = -1; break;}
-  else if(o == ConfTypeDlg) {ret = -1; break;}
-}
-if(ret != -1) {
-  if(ConfTypeDlgLocal->value())
-    ret = 1;
-  else if(ConfTypeDlgUser->value())
-    ret = 2;
-  else if(ConfTypeDlgGlobal->value())
-    ret = 3;
-}
-ConfTypeDlg->hide();
-return ret;
-\#endif} {}
-  }
-  Function {load_config()} {return_type int
-  } {
-    code {const char * filename;
-int i;
-\#ifndef WIN32
-const int FBSIZE = strlen(getenv("HOME")) + 40;
-char FileBuffer[FBSIZE];
-\#endif
-
-// Loading of main myserver.xml file
-
-switch(ConfType) {
-  case 1 :
-    filename = "myserver.xml";
-    break;
-\#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/myserver.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/myserver.xml";
-    break;
-\#endif
-  default :
-    return -1;
-    break;
-}
-
-xmlFile.close();
-
-if(xmlFile.open(filename) != 0)
-  return -1;
-
-load_myserver_core();
-
-// Loading of MIMEtypes.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "MIMEtypes.xml";
-    break;
-\#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/MIMEtypes.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/MIMEtypes.xml";
-    break;
-\#endif
-  default :
-    return -1;
-    break;
-}
-
-// Load the file
-if(MimeConf.load(filename))
-  return -1;
-
-// Populate the interface
-MimeConf.populateExt(Ext);
-MimeConf.populateMime(Mime);
-
-// Loading of virtualhosts.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "virtualhosts.xml";
-    break;
-\#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/virtualhosts.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/virtualhosts.xml";
-    break;
-\#endif
-  default :
-    return -1;
-    break;
-}
-
-// Load the file
-if(VHostConf.load(filename))
-  return -1;
-
-// Populate the interface
-VHostConf.populateName(Name);
-Name->value(0);
-VHostConf.populateHost(0, Host);
-VHostConf.populateIp(0, Ip);
-Port->value(VHostConf.getPort(0));
-Protocol->value(VHostConf.getProtocol(0));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(0));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(0));
-Ssl_Password->value(VHostConf.getSsl_Password(0));
-Docroot->value(VHostConf.getDocroot(0));
-Sysfolder->value(VHostConf.getSysfolder(0));
-Accesseslog->value(VHostConf.getAccesseslog(0));
-Warninglog->value(VHostConf.getWarninglog(0));
-Allow_CGI->value(VHostConf.getService(0, ALLOW_CGI));
-Allow_ISAPI->value(VHostConf.getService(0, ALLOW_ISAPI));
-Allow_MSCGI->value(VHostConf.getService(0, ALLOW_MSCGI));
-Allow_WINCGI->value(VHostConf.getService(0, ALLOW_WINCGI));
-Allow_FASTCGI->value(VHostConf.getService(0, ALLOW_FASTCGI));
-Allow_SEND_LINK->value(VHostConf.getService(0, ALLOW_SEND_LINK));
-Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(0, ALLOW_EXTERNAL_COMMANDS));
-Allow_SEND_FILE->value(VHostConf.getService(0, ALLOW_SEND_FILE));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}
-
-// End of function
-Changed = false;
-return 0;} {}
-  }
-  Function {load_config_remote()} {return_type int
-  } {
-    code {int i;
-int ret;
-MemBuf Buffer;
-Vector list;
-
-// ======== Progress display ========
-// Say something...
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (1/5)"));
-StatusDlg->show();
-fl_wait(200);  // let fltk do its thing
-// ======== Progress display ========
-
-// Get remote languages listing
-ret = Server.getLanguages(list);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-Language->clear();
-for(i = 0; i < list.size(); i++) {
-  Language->add(list.at(i)->Text);
-}
-
-// ======== Progress display ========
-// Say something...
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (2/5)"));
-StatusDlg->show();
-fl_wait(200);  // let fltk do its thing
-// ======== Progress display ========
-
-// Get remote protocols
-ret = Server.getDynamicProtocols(list);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-VHostConf.loadProtocols(list);
-VHostConf.populateProtocol(Protocol);
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (3/5)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Load remote myserver.xml
-ret = Server.getMyserverConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-xmlFile.close();
-ret = xmlFile.openMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-load_myserver_core();
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (4/5)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Load remote MIMEtypes.xml
-ret = Server.getMIMEtypesConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-ret = MimeConf.loadMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-// Populate the interface
-MimeConf.populateExt(Ext);
-MimeConf.populateMime(Mime);
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLDownload_Config, " (5/5)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Load remote virtualhosts.xml
-ret = Server.getVhostsConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-ret = VHostConf.loadMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-// Populate the interface
-VHostConf.populateName(Name);
-Name->value(0);
-VHostConf.populateHost(0, Host);
-VHostConf.populateIp(0, Ip);
-Port->value(VHostConf.getPort(0));
-Protocol->value(VHostConf.getProtocol(0));
-Ssl_Privatekey->value(VHostConf.getSsl_Privatekey(0));
-Ssl_Certificate->value(VHostConf.getSsl_Certificate(0));
-Ssl_Password->value(VHostConf.getSsl_Password(0));
-Docroot->value(VHostConf.getDocroot(0));
-Sysfolder->value(VHostConf.getSysfolder(0));
-Accesseslog->value(VHostConf.getAccesseslog(0));
-Warninglog->value(VHostConf.getWarninglog(0));
-Allow_CGI->value(VHostConf.getService(0, ALLOW_CGI));
-Allow_ISAPI->value(VHostConf.getService(0, ALLOW_ISAPI));
-Allow_MSCGI->value(VHostConf.getService(0, ALLOW_MSCGI));
-Allow_WINCGI->value(VHostConf.getService(0, ALLOW_WINCGI));
-Allow_FASTCGI->value(VHostConf.getService(0, ALLOW_FASTCGI));
-Allow_SCGI->value(VHostConf.getService(0, ALLOW_SCGI));
-Allow_SEND_LINK->value(VHostConf.getService(0, ALLOW_SEND_LINK));
-Allow_EXTERNAL_COMMANDS->value(VHostConf.getService(0, ALLOW_EXTERNAL_COMMANDS));
-Allow_SEND_FILE->value(VHostConf.getService(0, ALLOW_SEND_FILE));
-i = Protocol->value();
-if(i != 1 && i != 3) {
-  Ssl_Privatekey->deactivate();
-  Ssl_Certificate->deactivate();
-  Ssl_Password->deactivate();
-  SslButton1->deactivate();
-  SslButton2->deactivate();
-}
-else {
-  Ssl_Privatekey->activate();
-  Ssl_Certificate->activate();
-  Ssl_Password->activate();
-  SslButton1->activate();
-  SslButton2->activate();
-}
-
-// ======== Progress display ========
-fl_wait(500);  // oooo aaa effect
-StatusDlg->hide();
-// ======== Progress display ========
-
-// End of function
-Changed = false;
-return 0;} {}
-  }
-  Function {load_myserver_core()} {return_type int
-  } {
-    code {char * chrptr;
-int i;
-// <LANGUAGE>
-Language->value(0);
-for(i = 0; i < Language->size(); i++) {
-  if(strcmpi(getValueXML("LANGUAGE"), Language->text(i)) == 0) {
-    Language->value(i);
-    break;
-  }
-}
-
-// <VERBOSITY>
-Verbosity->value(atoi(getValueXML("VERBOSITY")));
-
-// <NTHREADS_STATIC>
-Nthreads_Static->value(atoi(getValueXML("NTHREADS_STATIC")));
-
-// <NTHREADS_MAX>
-Nthreads_Max->value(atoi(getValueXML("NTHREADS_MAX")));
-
-// <BUFFER_SIZE>
-Buffer_Size->value(atoi(getValueXML("BUFFER_SIZE")));
-
-// <DEFAULT_FILENAME>
-Default_Filename->clear();
-xmlDocPtr xmlDoc = xmlFile.getDoc();
-for(xmlNode *node = xmlDoc->children; node; node = node->next)
-{
-	if(!xmlStrcmp(node->name, (const xmlChar *)"MYSERVER"))
-	{
-		for(node = node->children; node; node = node->next)
-		{
-			if(!xmlStrcmp(node->name, (const xmlChar *)"DEFAULT_FILENAME"))
-			{
-				  Default_Filename->add((char*)node->children->content);
-			}
-		}
-		break;
-	}
-}
-
-// <CONNECTION_TIMEOUT>
-Connection_Timeout->value(atoi(getValueXML("CONNECTION_TIMEOUT")));
-
-// <USE_ERRORS_FILES>
-chrptr = xmlFile.getValue("USE_ERRORS_FILES");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E')
-  Use_Errors_Files->set();
-else
-  Use_Errors_Files->clear();
-
-// <MAX_CONNECTIONS>
-Max_Connections->value(atoi(getValueXML("MAX_CONNECTIONS")));
-
-// <MAX_LOG_FILE_SIZE>
-Max_Log_File_Size->value(atoi(getValueXML("MAX_LOG_FILE_SIZE")));
-
-// <BROWSEFOLDER_CSS>
-Browsefolder_Css->value(getValueXML("BROWSEFOLDER_CSS"));
-
-// <SERVER_ADMIN>
-Server_Admin->value(getValueXML("SERVER_ADMIN"));
-
-// <GZIP_THRESHOLD>
-Gzip_Threshold->value(atoi(getValueXML("GZIP_THRESHOLD")));
-
-// <CONTROL_ENABLED>
-chrptr = xmlFile.getValue("CONTROL_ENABLED");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Control_Enabled->set();
-  Control_Admin->activate();
-  Control_Password->activate();
-  // <CONTROL_ADMIN>
-  Control_Admin->value(getValueXML("CONTROL_ADMIN"));
-  // <CONTROL_PASSWORD>
-  Control_Password->value("");
-}
-else {
-  Control_Enabled->clear();
-  Control_Admin->deactivate();
-  Control_Password->deactivate();
-  Control_Admin->value("");
-  Control_Password->value("");
-}
-
-//<ALLOW_ANONYMOUS>
-chrptr = xmlFile.getValue("ALLOW_ANONYMOUS");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Anonymous->set();
-} else {
-  Allow_Anonymous->clear();
-}
-//<ANONYMOUS_NEED_PASS>
-chrptr = xmlFile.getValue("ANONYMOUS_NEED_PASS");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Anonymous_Needs_Password->set();
-} else {
-  Anonymous_Needs_Password->clear();
-}
-if ( Allow_Anonymous->value() == 1 ){
-Anonymous_Needs_Password->activate();
-}
-else{
-Anonymous_Needs_Password->deactivate();
-}
-//<ALLOW_ASYNCHRONOUS_CMDS>
-chrptr = xmlFile.getValue("ALLOW_ASYNCHRONOUS_CMDS");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Asynchronous_Cmds->set();
-} else {
-  Allow_Asynchronous_Cmds->clear();
-}
-//<ALLOW_PIPELINING>
-chrptr = xmlFile.getValue("ALLOW_PIPELINING");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Pipelining->set();
-} else {
-  Allow_Pipelining->clear();
-}
-//<ALLOW_STORE>
-chrptr = xmlFile.getValue("ALLOW_STORE");
-if(chrptr != 0 && chrptr[0] == 'Y' && chrptr[1] == 'E') {
-  Allow_Store_Cmds->set();
-} else {
-  Allow_Store_Cmds->clear();
-}
-
-// End of myserver.xml file
-return 0;} {}
-  }
-  Function {save_config()} {return_type int
-  } {
-    code {const char * filename;
-\#ifndef WIN32
-const int FBSIZE = strlen(getenv("HOME")) + 40;
-char FileBuffer[FBSIZE];
-\#endif
-
-// Saveing of main myserver.xml file
-
-switch(ConfType) {
-  case 1 :
-    filename = "myserver.xml";
-    break;
-\#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/myserver.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/myserver.xml";
-    break;
-\#endif
-  default :
-    return -1;
-    break;
-}
-
-xmlFile.close();
-
-if(xmlFile.open(filename) != 0)
-  return -1;
-
-save_myserver_core();
-
-xmlFile.save(filename);
-
-// Saveing of MIMEtypes.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "MIMEtypes.xml";
-    break;
-\#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/MIMEtypes.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/MIMEtypes.xml";
-    break;
-\#endif
-  default :
-    return -1;
-    break;
-}
-
-// Save the file
-if(MimeConf.save(filename))
-  return -1;
-
-// Saveing of virtualhosts.xml file
-switch(ConfType) {
-  case 1 :
-    filename = "virtualhosts.xml";
-    break;
-\#ifndef WIN32
-  case 2 :
-    snprintf(FileBuffer, FBSIZE, "%s/.myserver/virtualhosts.xml", getenv("HOME"));
-    filename = FileBuffer;
-    break;
-  case 3 :
-    filename = "/etc/myserver/virtualhosts.xml";
-    break;
-\#endif
-  default :
-    return -1;
-    break;
-}
-
-// Save the file
-if(VHostConf.save(filename))
-  return -1;
-
-// End of function
-Changed = false;
-return 0;} {}
-  }
-  Function {save_config_remote()} {return_type int
-  } {
-    code {int ret;
-MemBuf Buffer;
-
-// ======== Progress display ========
-// Say something...
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLSend_Config, " (1/3)"));
-StatusDlg->show();
-fl_wait(200);  // let fltk do its thing
-// ======== Progress display ========
-
-ret = Server.sendDisableReboot();
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// Send myserver.xml
-save_myserver_core();
-
-xmlFile.saveMemBuf(Buffer);
-
-ret = Server.sendMyserverConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLSend_Config, " (2/3)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Send MIMEtypes.xml
-ret = MimeConf.saveMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-ret = Server.sendMIMEtypesConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// ======== Progress display ========
-fl_wait(50);  // small delay
-StatusDlgProgress->value(0);
-StatusDlgProgress->label("0%");
-StatusDlgGroup->label(mystrcat(LanguageXMLSend_Config, " (3/3)"));
-fl_wait(50);  // small delay
-// ======== Progress display ========
-
-// Send virtualhosts.xml
-ret = VHostConf.saveMemBuf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -2;
-}
-
-ret = Server.sendVhostsConf(Buffer);
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-ret = Server.sendEnableReboot();
-if(ret) {
-  StatusDlg->hide();
-  return -1;
-}
-
-// ======== Progress display ========
-fl_wait(500);  // oooo aaa effect
-StatusDlg->hide();
-// ======== Progress display ========
-
-// End of function
-Changed = false;
-return 0;} {}
-  }
-  Function {save_myserver_core()} {return_type int
-  } {
-    code {char Buffer[256];
-int i;
-
-if(!xmlFile.getDoc()) {  // the file dose not exist so make one
-   xmlFile.newfile("MYSERVER");
-}
-
-// <LANGUAGE>
-setValueXML("LANGUAGE", Language->text());
-
-// <VERBOSITY>
-i = (int)Verbosity->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("VERBOSITY", Buffer);
-
-// <NTHREADS_STATIC>
-i = (int)Nthreads_Static->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("NTHREADS_STATIC", Buffer);
-
-// <NTHREADS_MAX>
-i = (int)Nthreads_Max->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("NTHREADS_MAX", Buffer);
-
-// <BUFFER_SIZE>
-i = (int)Buffer_Size->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("BUFFER_SIZE", Buffer);
-
-// <DEFAULT_FILENAME>
-for(i = 0; i < Default_Filename->size(); i++) {
-  setValueXML("DEFAULT_FILENAME",  Default_Filename->text(i + 1));
-}
-
-// <CONNECTION_TIMEOUT>
-i = (int)Connection_Timeout->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("CONNECTION_TIMEOUT", Buffer);
-
-// <USE_ERRORS_FILES>
-if(Use_Errors_Files->value())
-  setValueXML("USE_ERRORS_FILES", "YES");
-else
-  setValueXML("USE_ERRORS_FILES", "NO");
-
-// <MAX_CONNECTIONS>
-i = (int)Max_Connections->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("MAX_CONNECTIONS", Buffer);
-
-// <MAX_LOG_FILE_SIZE>
-i = (int)Max_Log_File_Size->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("MAX_LOG_FILE_SIZE", Buffer);
-
-// <BROWSEFOLDER_CSS>
-setValueXML("BROWSEFOLDER_CSS", Browsefolder_Css->value());
-
-// <SERVER_ADMIN>
-setValueXML("SERVER_ADMIN", Server_Admin->value());
-
-// <GZIP_THRESHOLD>
-i = (int)Gzip_Threshold->value();
-snprintf(Buffer, 256, "%d", i);
-setValueXML("GZIP_THRESHOLD", Buffer);
-
-// <CONTROL_ENABLED>
-if(Control_Enabled->value() == 1) {
-  setValueXML("CONTROL_ENABLED", "YES");
-  // <CONTROL_ADMIN>
-  setValueXML("CONTROL_ADMIN", Control_Admin->value());
-  // <CONTROL_PASSWORD>
-  const char * chrptr = Control_Password->value();
-  if(chrptr[0] != '\\0') {
-    char tempbuffer[32];
-    Md5 md5;
-    md5.init();
-    md5.update((const unsigned char*)chrptr, strlen(chrptr));
-    md5.end(tempbuffer);
-    setValueXML("CONTROL_PASSWORD", tempbuffer);
-    xmlFile.setAttr("MD5", "YES");
-  }
-}
-else {
-  setValueXML("CONTROL_ENABLED", "NO");
-}
-
-//<ALLOW_ANONYMOUS>
-if(Allow_Anonymous->value() == 1) {
-  setValueXML("ALLOW_ANONYMOUS", "YES");
-} else {
-  setValueXML("ALLOW_ANONYMOUS", "NO");
-}
-//<ANONYMOUS_NEED_PASS>
-if(Anonymous_Needs_Password->value() == 1) {
-  setValueXML("ANONYMOUS_NEED_PASS", "YES");
-} else {
-  setValueXML("ANONYMOUS_NEED_PASS", "NO");
-}
-//<ALLOW_ASYNCHRONOUS_CMDS>
-if(Allow_Asynchronous_Cmds->value() == 1) {
-  setValueXML("ALLOW_ASYNCHRONOUS_CMDS", "YES");
-} else {
-  setValueXML("ALLOW_ASYNCHRONOUS_CMDS", "NO");
-}
-//<ALLOW_PIPELINING>
-if(Allow_Pipelining->value() == 1) {
-  setValueXML("ALLOW_PIPELINING", "YES");
-} else {
-  setValueXML("ALLOW_PIPELINING", "NO");
-}
-//<ALLOW_STORE>
-if(Allow_Store_Cmds->value() == 1) {
-  setValueXML("ALLOW_STORE", "YES");
-} else {
-  setValueXML("ALLOW_STORE", "NO");
-}
-
-// End of myserver.xml file
-return 0;} {}
-  }
-  Function {setDynamic(Vector & list)} {return_type void
-  } {
-    code {VHostConf.loadProtocols(list);
-VHostConf.populateProtocol(Protocol);} {}
-  }
-  decl {int ConfType;} {public
-  }
-  Function {getValueXML(const char * name)} {private return_type {const char *}
-  } {
-    code {char * chrptr;
-chrptr = xmlFile.getValue((char *)name);
-if(chrptr == 0)
-  return "";
-return chrptr;} {}
-  }
-  Function {setValueXML(const char * name, const char * value)} {private return_type void
-  } {
-    code {char * chrptr;
-chrptr = xmlFile.getValue((char *)name);
-if(chrptr == 0)
-  xmlFile.addChild(name, value);
-else
-  xmlFile.setValue((char *)name, (char *)value);} {}
-  }
-  Function {ServerLogout()} {private return_type void
-  } {
-    code {Server.Logout();
-MenuLogout->deactivate();
-MenuGetConfig->deactivate();
-MenuSendConfig->deactivate();
-MenuConnections->deactivate();
-MenuReboot->deactivate();} {}
-  }
-  Function {ServerLogin(bool stat)} {private return_type int
-  } {
-    code {LoginDlg->show();
-int ret;
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait();
-  else if(o == LoginDlgOK) {ret = 0; break;}
-  else if(o == LoginDlgCancel) {ret = -1; break;}
-  else if(o == LoginDlg) {ret = -1; break;}
-}
-LoginDlg->hide();
-
-if(ret) {
-  LoginDlgPass->value("");
-  return -1;
-}
-
-if(stat) {
-  // Say something...
-  StatusDlgProgress->value(0);
-  StatusDlgProgress->label("0%");
-  StatusDlgGroup->label(LanguageXMLConnect_Server);
-  StatusDlg->show();
-  fl_wait(200);  // let fltk do its thing
-}
-
-ret = Server.Login(LoginDlgAddress->value(),
-                   (int)LoginDlgPort->value(),
-                   LoginDlgName->value(),
-                   LoginDlgPass->value());
-
-LoginDlgPass->value("");
-
-if(ret) {
-  StatusDlg->hide();
-  fl_alertcat(LanguageXMLLogin_Failed, Server.LastCode);
-  return -1;
-}
-
-MenuLogout->activate();
-MenuGetConfig->activate();
-MenuSendConfig->activate();
-MenuConnections->activate();
-MenuReboot->activate();
-
-if(stat) {
-  // Show we are done...
-  StatusDlgProgress->value(100);
-  StatusDlgProgress->label("100%");
-  fl_wait(500);  // oooo aaa effect
-  StatusDlg->hide();
-}
-
-return 0;} {}
-  }
-  Function {ServerConnections()} {private return_type void
-  } {
-    code {int ret;
-int time;
-int i;
-MemBuf MSvr;
-Vector list;
-ConnectionsDlgVr->value("");
-ConnectionsDlgList->clear();
-ConnectionsDlg->show();
-fl_wait(200);
-
-// see if we are connected by getting the vr
-ret = Server.getVersion(MSvr);
-
-if(ret) { // relogin?
-  ret = ServerLogin(false);
-  if(!ret) {
-    ret = Server.getVersion(MSvr);
-  }
-}
-
-if(ret) { // no dice
-  fl_alert(LanguageXMLCannot_Connect);
-  ConnectionsDlg->hide();
-  return;
-}
-
-// update display
-MSvr << '\\0';
-ConnectionsDlgVr->value((const char *)MSvr.getBuffer());
-
-time = getTicks();
-ConnectionsDlgList->clear();
-ret = Server.getConnections(list);
-
-if(ret) {
-  fl_alertcat(LanguageXMLServer_Closed, Server.LastCode);
-  ConnectionsDlg->hide();
-  ServerLogout();
-  return;
-}
-
-list.sort();
-for(i = 0; i < list.size(); i++) {
-  ConnectionsDlgList->add(list.at(i)->Text);
-}
-
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait(1);
-  else if(o == ConnectionsDlgDone) {break; }
-  else if(o == ConnectionsDlg) {break; }
-  else if(o == ConnectionsDlgKill) {
-    i = ConnectionsDlgList->value();
-    if(i != 0) {
-      ret = Server.sendKillConnection(list.at(i - 1));
-      if(ret) {
-        fl_alertcat(LanguageXMLServer_Closed, Server.LastCode);
-        ServerLogout();
-        break;
-      } // if
-      // A cheap trick
-      time = (int)getTicks() - (int)ConnectionsDlgRate->value() * 2000;
-    } // if
-  } // else if
-
-  if((int)(getTicks() - time) > (int)ConnectionsDlgRate->value() * 1000) {
-    time = getTicks();
-    ConnectionsDlgList->clear();
-    ret = Server.getConnections(list);
-
-    if(ret) {
-      fl_alertcat(LanguageXMLServer_Closed, Server.LastCode);
-      ServerLogout();
-      break;
-    } // if
-
-    list.sort();
-    for(i = 0; i < list.size(); i++) {
-      ConnectionsDlgList->add(list.at(i)->Text);
-    } // for
-  } // if
-} // for
-
-ConnectionsDlg->hide();} {}
-  }
-  Function {regex_input(const char * capt, bool & reg)} {private return_type {char *}
-  } {
-    code {fl_beep(FL_BEEP_QUESTION);
-RegaskDlgInput->value("");
-RegaskDlgInput->label(capt);
-RegaskDlgRegex->value(false);
-RegaskDlg->hotspot(RegaskDlgCancel);
-RegaskDlg->show();
-int ret;
-for(;;) {
-  Fl_Widget *o = Fl::readqueue();
-  if(!o) Fl::wait();
-  else if(o == RegaskDlgOK) {ret = 0; break;}
-  else if(o == RegaskDlgCancel) {ret = -1; break;}
-  else if(o == RegaskDlg) {ret = -1; break;}
-}
-RegaskDlg->hide();
-
-if(ret || strcmp(RegaskDlgInput->value(), "") == 0) {
-  return NULL;
-}
-  
-reg = RegaskDlgRegex->value();
-return (char *)RegaskDlgInput->value();} {}
-  }
-  Function {fl_alertcat(const char * c1, const char * c2)} {private return_type void
-  } {
-    code {char temp[strlen(c1) + strlen(c2)];
-strncpy(temp, c1, (strlen(c1) + strlen(c2)));
-strncat(temp, c2, (strlen(c1) + strlen(c2) + 1));
-fl_alert(temp);} {}
-  }
-  Function {fl_wait(int len)} {private return_type void
-  } {
-    code {int time = (int)getTicks();
-while((int)(getTicks() - time) < len) {
-  Fl::wait(0);
-}} {}
-  }
-  Function {mystrcat(const char * a, const char * b)} {private return_type {const char *}
-  } {
-    code {static char temp[255];
-strncpy(temp, a, 255);
-strncat(temp, b, 255);
-return temp;} {}
-  }
-  decl {bool Changed;} {}
-  decl {MIMEtypeXML MimeConf;} {}
-  decl {VHostXML VHostConf;} {}
-  decl {XmlParser xmlFile;} {}
-  decl {ControlClient Server;} {}
-} 
diff --git a/misc/control/control/fltkconfig.h b/misc/control/control/fltkconfig.h
deleted file mode 100644
index b8b0f9a..0000000
--- a/misc/control/control/fltkconfig.h
+++ /dev/null
@@ -1,439 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0108
-
-#ifndef fltkconfig_h
-#define fltkconfig_h
-#include <FL/Fl.H>
-#include <FL/Fl_Double_Window.H>
-#include <FL/Fl_Menu_Bar.H>
-#include <FL/Fl_Tabs.H>
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Value_Input.H>
-#include <FL/Fl_Choice.H>
-#include <FL/Fl_Input.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Check_Button.H>
-#include <FL/Fl_Browser.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Round_Button.H>
-#include <FL/Fl_Return_Button.H>
-#include <FL/Fl_Text_Display.H>
-#include <FL/Fl_Progress.H>
-#include <FL/Fl_Output.H>
-#include <FL/Fl_Counter.H>
-#include <FL/Fl_File_Chooser.H>
-#include <FL/fl_ask.H>
-
-#include <include/base/xml/xml_parser.h>
-#include <include/base/string/stringutils.h>
-#include <include/base/md5/md5.h>
-#include <include/base/utility.h>
-#include "service.h"
-#include "language.h"
-#include "mimetype.h"
-#include "vhost.h"
-#include "control_client.h"
-#include "progress.h"
-
-class MainDlg {
-public:
-  Fl_Double_Window* make_window();
-  Fl_Double_Window *ConfDlg;
-private:
-  void cb_ConfDlg_i(Fl_Double_Window*, void*);
-  static void cb_ConfDlg(Fl_Double_Window*, void*);
-  static Fl_Menu_Item menu_[];
-  void cb_Open_i(Fl_Menu_*, void*);
-  static void cb_Open(Fl_Menu_*, void*);
-  void cb_Save_i(Fl_Menu_*, void*);
-  static void cb_Save(Fl_Menu_*, void*);
-  void cb_Revert_i(Fl_Menu_*, void*);
-  static void cb_Revert(Fl_Menu_*, void*);
-  void cb_as_i(Fl_Menu_*, void*);
-  static void cb_as(Fl_Menu_*, void*);
-  void cb_as1_i(Fl_Menu_*, void*);
-  static void cb_as1(Fl_Menu_*, void*);
-  void cb_Console_i(Fl_Menu_*, void*);
-  static void cb_Console(Fl_Menu_*, void*);
-  void cb_Service_i(Fl_Menu_*, void*);
-  static void cb_Service(Fl_Menu_*, void*);
-  void cb_Quit_i(Fl_Menu_*, void*);
-  static void cb_Quit(Fl_Menu_*, void*);
-  void cb_Install_i(Fl_Menu_*, void*);
-  static void cb_Install(Fl_Menu_*, void*);
-  void cb_Remove_i(Fl_Menu_*, void*);
-  static void cb_Remove(Fl_Menu_*, void*);
-  void cb_Login_i(Fl_Menu_*, void*);
-  static void cb_Login(Fl_Menu_*, void*);
-public:
-  static Fl_Menu_Item *MenuLogout;
-private:
-  void cb_MenuLogout_i(Fl_Menu_*, void*);
-  static void cb_MenuLogout(Fl_Menu_*, void*);
-public:
-  static Fl_Menu_Item *MenuGetConfig;
-private:
-  void cb_MenuGetConfig_i(Fl_Menu_*, void*);
-  static void cb_MenuGetConfig(Fl_Menu_*, void*);
-public:
-  static Fl_Menu_Item *MenuSendConfig;
-private:
-  void cb_MenuSendConfig_i(Fl_Menu_*, void*);
-  static void cb_MenuSendConfig(Fl_Menu_*, void*);
-public:
-  static Fl_Menu_Item *MenuConnections;
-private:
-  void cb_MenuConnections_i(Fl_Menu_*, void*);
-  static void cb_MenuConnections(Fl_Menu_*, void*);
-public:
-  static Fl_Menu_Item *MenuReboot;
-private:
-  void cb_MenuReboot_i(Fl_Menu_*, void*);
-  static void cb_MenuReboot(Fl_Menu_*, void*);
-  void cb_About_i(Fl_Menu_*, void*);
-  static void cb_About(Fl_Menu_*, void*);
-public:
-  Fl_Value_Input *Buffer_Size;
-private:
-  void cb_Buffer_Size_i(Fl_Value_Input*, void*);
-  static void cb_Buffer_Size(Fl_Value_Input*, void*);
-public:
-  Fl_Choice *Verbosity;
-private:
-  void cb_Verbosity_i(Fl_Choice*, void*);
-  static void cb_Verbosity(Fl_Choice*, void*);
-  static Fl_Menu_Item menu_Verbosity[];
-public:
-  Fl_Value_Input *Max_Log_File_Size;
-private:
-  void cb_Max_Log_File_Size_i(Fl_Value_Input*, void*);
-  static void cb_Max_Log_File_Size(Fl_Value_Input*, void*);
-public:
-  Fl_Value_Input *Nthreads_Static;
-private:
-  void cb_Nthreads_Static_i(Fl_Value_Input*, void*);
-  static void cb_Nthreads_Static(Fl_Value_Input*, void*);
-public:
-  Fl_Value_Input *Nthreads_Max;
-private:
-  void cb_Nthreads_Max_i(Fl_Value_Input*, void*);
-  static void cb_Nthreads_Max(Fl_Value_Input*, void*);
-public:
-  Fl_Choice *Language;
-private:
-  void cb_Language_i(Fl_Choice*, void*);
-  static void cb_Language(Fl_Choice*, void*);
-public:
-  Fl_Value_Input *Connection_Timeout;
-private:
-  void cb_Connection_Timeout_i(Fl_Value_Input*, void*);
-  static void cb_Connection_Timeout(Fl_Value_Input*, void*);
-public:
-  Fl_Value_Input *Max_Connections;
-private:
-  void cb_Max_Connections_i(Fl_Value_Input*, void*);
-  static void cb_Max_Connections(Fl_Value_Input*, void*);
-public:
-  Fl_Value_Input *Gzip_Threshold;
-private:
-  void cb_Gzip_Threshold_i(Fl_Value_Input*, void*);
-  static void cb_Gzip_Threshold(Fl_Value_Input*, void*);
-public:
-  Fl_Input *Browsefolder_Css;
-private:
-  void cb_Browsefolder_Css_i(Fl_Input*, void*);
-  static void cb_Browsefolder_Css(Fl_Input*, void*);
-  void cb_Browse_i(Fl_Button*, void*);
-  static void cb_Browse(Fl_Button*, void*);
-public:
-  Fl_Check_Button *Use_Errors_Files;
-private:
-  void cb_Use_Errors_Files_i(Fl_Check_Button*, void*);
-  static void cb_Use_Errors_Files(Fl_Check_Button*, void*);
-public:
-  Fl_Browser *Default_Filename;
-private:
-  void cb_Add_i(Fl_Button*, void*);
-  static void cb_Add(Fl_Button*, void*);
-  void cb_Remove1_i(Fl_Button*, void*);
-  static void cb_Remove1(Fl_Button*, void*);
-public:
-  Fl_Browser *Ext;
-private:
-  void cb_Ext_i(Fl_Browser*, void*);
-  static void cb_Ext(Fl_Browser*, void*);
-  void cb_Add1_i(Fl_Button*, void*);
-  static void cb_Add1(Fl_Button*, void*);
-  void cb_Remove2_i(Fl_Button*, void*);
-  static void cb_Remove2(Fl_Button*, void*);
-public:
-  Fl_Choice *Mime;
-private:
-  void cb_Mime_i(Fl_Choice*, void*);
-  static void cb_Mime(Fl_Choice*, void*);
-  void cb_Add2_i(Fl_Button*, void*);
-  static void cb_Add2(Fl_Button*, void*);
-public:
-  Fl_Choice *Cmd;
-private:
-  void cb_Cmd_i(Fl_Choice*, void*);
-  static void cb_Cmd(Fl_Choice*, void*);
-  static Fl_Menu_Item menu_Cmd[];
-public:
-  Fl_Input *Manager;
-private:
-  void cb_Manager_i(Fl_Input*, void*);
-  static void cb_Manager(Fl_Input*, void*);
-public:
-  Fl_Button *ManagerButton;
-private:
-  void cb_ManagerButton_i(Fl_Button*, void*);
-  static void cb_ManagerButton(Fl_Button*, void*);
-public:
-  Fl_Choice *Name;
-private:
-  void cb_Name_i(Fl_Choice*, void*);
-  static void cb_Name(Fl_Choice*, void*);
-  void cb_Add3_i(Fl_Button*, void*);
-  static void cb_Add3(Fl_Button*, void*);
-  void cb_Remove3_i(Fl_Button*, void*);
-  static void cb_Remove3(Fl_Button*, void*);
-public:
-  Fl_Choice *Protocol;
-private:
-  void cb_Protocol_i(Fl_Choice*, void*);
-  static void cb_Protocol(Fl_Choice*, void*);
-  static Fl_Menu_Item menu_Protocol[];
-public:
-  Fl_Input *Ssl_Privatekey;
-private:
-  void cb_Ssl_Privatekey_i(Fl_Input*, void*);
-  static void cb_Ssl_Privatekey(Fl_Input*, void*);
-public:
-  Fl_Input *Ssl_Certificate;
-private:
-  void cb_Ssl_Certificate_i(Fl_Input*, void*);
-  static void cb_Ssl_Certificate(Fl_Input*, void*);
-public:
-  Fl_Input *Ssl_Password;
-private:
-  void cb_Ssl_Password_i(Fl_Input*, void*);
-  static void cb_Ssl_Password(Fl_Input*, void*);
-public:
-  Fl_Button *SslButton1;
-private:
-  void cb_SslButton1_i(Fl_Button*, void*);
-  static void cb_SslButton1(Fl_Button*, void*);
-public:
-  Fl_Button *SslButton2;
-private:
-  void cb_SslButton2_i(Fl_Button*, void*);
-  static void cb_SslButton2(Fl_Button*, void*);
-public:
-  Fl_Browser *Host;
-  Fl_Browser *Ip;
-private:
-  void cb_Add4_i(Fl_Button*, void*);
-  static void cb_Add4(Fl_Button*, void*);
-  void cb_Remove4_i(Fl_Button*, void*);
-  static void cb_Remove4(Fl_Button*, void*);
-  void cb_Add5_i(Fl_Button*, void*);
-  static void cb_Add5(Fl_Button*, void*);
-  void cb_Remove5_i(Fl_Button*, void*);
-  static void cb_Remove5(Fl_Button*, void*);
-public:
-  Fl_Value_Input *Port;
-private:
-  void cb_Port_i(Fl_Value_Input*, void*);
-  static void cb_Port(Fl_Value_Input*, void*);
-public:
-  Fl_Check_Button *Allow_CGI;
-private:
-  void cb_Allow_CGI_i(Fl_Check_Button*, void*);
-  static void cb_Allow_CGI(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_ISAPI;
-private:
-  void cb_Allow_ISAPI_i(Fl_Check_Button*, void*);
-  static void cb_Allow_ISAPI(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_MSCGI;
-private:
-  void cb_Allow_MSCGI_i(Fl_Check_Button*, void*);
-  static void cb_Allow_MSCGI(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_WINCGI;
-private:
-  void cb_Allow_WINCGI_i(Fl_Check_Button*, void*);
-  static void cb_Allow_WINCGI(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_FASTCGI;
-private:
-  void cb_Allow_FASTCGI_i(Fl_Check_Button*, void*);
-  static void cb_Allow_FASTCGI(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_SCGI;
-private:
-  void cb_Allow_SCGI_i(Fl_Check_Button*, void*);
-  static void cb_Allow_SCGI(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_SEND_LINK;
-private:
-  void cb_Allow_SEND_LINK_i(Fl_Check_Button*, void*);
-  static void cb_Allow_SEND_LINK(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_EXTERNAL_COMMANDS;
-private:
-  void cb_Allow_EXTERNAL_COMMANDS_i(Fl_Check_Button*, void*);
-  static void cb_Allow_EXTERNAL_COMMANDS(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_SEND_FILE;
-private:
-  void cb_Allow_SEND_FILE_i(Fl_Check_Button*, void*);
-  static void cb_Allow_SEND_FILE(Fl_Check_Button*, void*);
-public:
-  Fl_Input *Docroot;
-private:
-  void cb_Docroot_i(Fl_Input*, void*);
-  static void cb_Docroot(Fl_Input*, void*);
-public:
-  Fl_Input *Sysfolder;
-private:
-  void cb_Sysfolder_i(Fl_Input*, void*);
-  static void cb_Sysfolder(Fl_Input*, void*);
-  void cb_Browse1_i(Fl_Button*, void*);
-  static void cb_Browse1(Fl_Button*, void*);
-  void cb_Browse2_i(Fl_Button*, void*);
-  static void cb_Browse2(Fl_Button*, void*);
-public:
-  Fl_Input *Accesseslog;
-private:
-  void cb_Accesseslog_i(Fl_Input*, void*);
-  static void cb_Accesseslog(Fl_Input*, void*);
-public:
-  Fl_Input *Warninglog;
-private:
-  void cb_Warninglog_i(Fl_Input*, void*);
-  static void cb_Warninglog(Fl_Input*, void*);
-public:
-  Fl_Input *Server_Admin;
-private:
-  void cb_Server_Admin_i(Fl_Input*, void*);
-  static void cb_Server_Admin(Fl_Input*, void*);
-public:
-  Fl_Input *Control_Admin;
-private:
-  void cb_Control_Admin_i(Fl_Input*, void*);
-  static void cb_Control_Admin(Fl_Input*, void*);
-public:
-  Fl_Input *Control_Password;
-private:
-  void cb_Control_Password_i(Fl_Input*, void*);
-  static void cb_Control_Password(Fl_Input*, void*);
-public:
-  Fl_Check_Button *Control_Enabled;
-private:
-  void cb_Control_Enabled_i(Fl_Check_Button*, void*);
-  static void cb_Control_Enabled(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_Anonymous;
-private:
-  void cb_Allow_Anonymous_i(Fl_Check_Button*, void*);
-  static void cb_Allow_Anonymous(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Anonymous_Needs_Password;
-private:
-  void cb_Anonymous_Needs_Password_i(Fl_Check_Button*, void*);
-  static void cb_Anonymous_Needs_Password(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_Asynchronous_Cmds;
-private:
-  void cb_Allow_Asynchronous_Cmds_i(Fl_Check_Button*, void*);
-  static void cb_Allow_Asynchronous_Cmds(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_Pipelining;
-private:
-  void cb_Allow_Pipelining_i(Fl_Check_Button*, void*);
-  static void cb_Allow_Pipelining(Fl_Check_Button*, void*);
-public:
-  Fl_Check_Button *Allow_Store_Cmds;
-private:
-  void cb_Allow_Store_Cmds_i(Fl_Check_Button*, void*);
-  static void cb_Allow_Store_Cmds(Fl_Check_Button*, void*);
-public:
-  Fl_Double_Window* make_type();
-  Fl_Double_Window *ConfTypeDlg;
-  Fl_Round_Button *ConfTypeDlgLocal;
-private:
-  void cb_ConfTypeDlgLocal_i(Fl_Round_Button*, void*);
-  static void cb_ConfTypeDlgLocal(Fl_Round_Button*, void*);
-public:
-  Fl_Round_Button *ConfTypeDlgUser;
-private:
-  void cb_ConfTypeDlgUser_i(Fl_Round_Button*, void*);
-  static void cb_ConfTypeDlgUser(Fl_Round_Button*, void*);
-public:
-  Fl_Round_Button *ConfTypeDlgGlobal;
-private:
-  void cb_ConfTypeDlgGlobal_i(Fl_Round_Button*, void*);
-  static void cb_ConfTypeDlgGlobal(Fl_Round_Button*, void*);
-public:
-  Fl_Return_Button *ConfTypeDlgOK;
-  Fl_Button *ConfTypeDlgCancel;
-  Fl_Double_Window* make_about();
-  Fl_Double_Window *AboutDlg;
-  Fl_Text_Display *AboutText;
-private:
-  void cb_OK_i(Fl_Return_Button*, void*);
-  static void cb_OK(Fl_Return_Button*, void*);
-public:
-  Fl_Double_Window* make_login();
-  Fl_Double_Window *LoginDlg;
-  Fl_Input *LoginDlgAddress;
-  Fl_Value_Input *LoginDlgPort;
-  Fl_Input *LoginDlgName;
-  Fl_Input *LoginDlgPass;
-  Fl_Return_Button *LoginDlgOK;
-  Fl_Button *LoginDlgCancel;
-  Fl_Double_Window* make_status();
-  Fl_Double_Window *StatusDlg;
-  Fl_Group *StatusDlgGroup;
-  Fl_Progress *StatusDlgProgress;
-  Fl_Double_Window* make_connections();
-  Fl_Double_Window *ConnectionsDlg;
-  Fl_Output *ConnectionsDlgVr;
-  Fl_Browser *ConnectionsDlgList;
-  Fl_Counter *ConnectionsDlgRate;
-  Fl_Button *ConnectionsDlgKill;
-  Fl_Button *ConnectionsDlgDone;
-  Fl_Double_Window* make_regask();
-  Fl_Double_Window *RegaskDlg;
-  Fl_Input *RegaskDlgInput;
-  Fl_Button *RegaskDlgCancel;
-  Fl_Return_Button *RegaskDlgOK;
-  Fl_Check_Button *RegaskDlgRegex;
-  int ask_type();
-  int load_config();
-  int load_config_remote();
-  int load_myserver_core();
-  int save_config();
-  int save_config_remote();
-  int save_myserver_core();
-  void setDynamic(Vector & list);
-  int ConfType; 
-private:
-  const char * getValueXML(const char * name);
-  void setValueXML(const char * name, const char * value);
-  void ServerLogout();
-  int ServerLogin(bool stat);
-  void ServerConnections();
-  char * regex_input(const char * capt, bool & reg);
-  void fl_alertcat(const char * c1, const char * c2);
-  void fl_wait(int len);
-  const char * mystrcat(const char * a, const char * b);
-  bool Changed; 
-  MIMEtypeXML MimeConf; 
-  VHostXML VHostConf; 
-  XmlParser xmlFile; 
-  ControlClient Server; 
-};
-#endif
diff --git a/misc/control/control/language.cpp b/misc/control/control/language.cpp
deleted file mode 100644
index 59ebd9d..0000000
--- a/misc/control/control/language.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004, 2006 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.
-
- 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 "language.h"
-
-extern "C"
-{
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-}
-
-#include <include/base/file/files_utility.h>
-
-// Debug flag.  Set this to print (to stdout) xml tags that were not found.
-// This will generate the expected xml data that was not found that can
-// be copied to the english file.
-//#define DEBUG
-
-// pre vector.cpp, but it works
-struct TextNode
-{
-   char * Val;
-   TextNode * next;
-};
-
-//
-// Some internal functions
-//
-static void LanguageXMLload();
-static inline const char * textmangler(const char *);
-static void AddText(char *);
-static void ClearList();
-static int LanguageXMLfile(const char *);
-
-//
-// State vars and file handels
-//
-static TextNode * TextList = NULL;
-static bool loaded = false;
-static bool loadok = true;
-static XmlParser xmlFile;
-
-//
-// Const strings used for dialogs and messages
-// 
-const char * LanguageXMLLast_Change;
-const char * LanguageXMLNot_Found;
-const char * LanguageXMLReload_Prev;
-const char * LanguageXMLEnter_Default;
-const char * LanguageXMLAbout_Text;
-const char * LanguageXMLEnter_Extension;
-const char * LanguageXMLEnter_MIME;
-const char * LanguageXMLEnter_Name;
-const char * LanguageXMLEnter_Host;
-const char * LanguageXMLEnter_Ip;
-const char * LanguageXMLDownload_Config;
-const char * LanguageXMLDownload_Failed;
-const char * LanguageXMLKill_All;
-const char * LanguageXMLSend_Config;
-const char * LanguageXMLUpload_Failed;
-const char * LanguageXMLNot_Save;
-const char * LanguageXMLReboot_Failed;
-const char * LanguageXMLConnect_Server;
-const char * LanguageXMLLogin_Failed;
-const char * LanguageXMLCannot_Connect;
-const char * LanguageXMLServer_Closed;
-const char * LanguageXMLYes;
-const char * LanguageXMLNo;
-
-///
-/// Add the ptr to the list for latter deletetion.
-///
-void AddText(char * val)
-{
-   TextNode * current = new TextNode;
-   current->Val = val;
-   current->next = TextList;
-   TextList = current;
-}
-
-///
-/// Delete all alcotatied memory.
-///
-void ClearList()
-{
-   TextNode * current;
-   while(TextList != NULL)
-     {
-	current = TextList;
-	TextList = TextList->next;
-	free(current->Val);
-	delete current;
-     }
-}
-
-///
-/// Initilize pointers and logic values.
-///
-void LanguageXMLinit()
-{
-   LanguageXMLLast_Change = strdup("Last change not saved.  Continue anyway?");
-   LanguageXMLNot_Found = strdup("Config files not found.");
-   LanguageXMLReload_Prev = strdup("Reload prevous values?");
-   LanguageXMLEnter_Default = strdup("Please enter a default file name:");
-   LanguageXMLAbout_Text = strdup("MyServer Configure (FLTK)\nCopyright (C) 2002, 2003, 2004\nFree Software Foundation, Inc.\nThis program is licensed under the GPL.");
-   LanguageXMLEnter_Extension = strdup("Enter new extension (Example: html):");
-   LanguageXMLEnter_MIME = strdup("Enter new MIME type (Example: text/html):");
-   LanguageXMLEnter_Name = strdup("Enter a new name:");
-   LanguageXMLEnter_Host = strdup("Enter a new host name:");
-   LanguageXMLEnter_Ip = strdup("Enter a new IP:");
-   LanguageXMLDownload_Config = strdup("Downloading config files:");
-   LanguageXMLDownload_Failed = strdup("Download failed.  Code: ");
-   LanguageXMLKill_All = strdup("This will kill all connections.  Are you sure?");
-   LanguageXMLSend_Config = strdup("Sending config files:");
-   LanguageXMLUpload_Failed = strdup("Upload failed.  Code: ");
-   LanguageXMLNot_Save = strdup("Could not save.");
-   LanguageXMLReboot_Failed = strdup("Reboot failed.");
-   LanguageXMLConnect_Server = strdup("Connecting to server:");
-   LanguageXMLLogin_Failed = strdup("Login failed.  Code: ");
-   LanguageXMLCannot_Connect = strdup("Could not connect to server.");
-   LanguageXMLServer_Closed = strdup("Server closed connection.  Code: ");
-   LanguageXMLYes = strdup("Yes");
-   LanguageXMLNo = strdup("No");
-   loaded = false;
-   loadok = true;
-}
-
-///
-/// The cleanup function.
-/// This function should be called before exiting the program.
-///
-void LanguageXMLend()
-{
-   free((char *)LanguageXMLLast_Change);
-   free((char *)LanguageXMLNot_Found);
-   free((char *)LanguageXMLReload_Prev);
-   free((char *)LanguageXMLEnter_Default);
-   free((char *)LanguageXMLAbout_Text);
-   free((char *)LanguageXMLEnter_Extension);
-   free((char *)LanguageXMLEnter_MIME);
-   free((char *)LanguageXMLEnter_Name);
-   free((char *)LanguageXMLEnter_Host);
-   free((char *)LanguageXMLEnter_Ip);
-   free((char *)LanguageXMLDownload_Config);
-   free((char *)LanguageXMLDownload_Failed);
-   free((char *)LanguageXMLKill_All);
-   free((char *)LanguageXMLSend_Config);
-   free((char *)LanguageXMLUpload_Failed);
-   free((char *)LanguageXMLNot_Save);
-   free((char *)LanguageXMLReboot_Failed);
-   free((char *)LanguageXMLConnect_Server);
-   free((char *)LanguageXMLLogin_Failed);
-   free((char *)LanguageXMLCannot_Connect);
-   free((char *)LanguageXMLServer_Closed);
-   free((char *)LanguageXMLYes);
-   free((char *)LanguageXMLNo);
-   ClearList();
-}
-
-///
-/// Internal function to automaticaly free memory when seting to a
-/// new value.
-///
-static int SetValueXML(char ** dest, const char * tag)
-{
-   char * val;
-   val = xmlFile.getValue((char *)tag);
-   if(val != NULL)
-     {
-	free(*dest);
-	*dest = strdup(val);
-     }
-   return 0;
-}
-
-///
-/// Load the xml file and set const pointers.
-///
-int LanguageXMLfile(const char * filename)
-{
-   if(xmlFile.open((char *)filename))
-     return -1;
-
-   loaded = true;
-
-   SetValueXML((char **)&LanguageXMLLast_Change, "LAST_CHANGE");
-   SetValueXML((char **)&LanguageXMLNot_Found, "NOT_FOUND");
-   SetValueXML((char **)&LanguageXMLReload_Prev, "RELOAD_PREV");
-   SetValueXML((char **)&LanguageXMLEnter_Default, "ENTER_DEFAULT");
-   SetValueXML((char **)&LanguageXMLAbout_Text, "ABOUT_TEXT");
-   SetValueXML((char **)&LanguageXMLEnter_Extension, "ENTER_EXTENSION");
-   SetValueXML((char **)&LanguageXMLEnter_MIME, "ENTER_MIME");
-   SetValueXML((char **)&LanguageXMLEnter_Name, "ENTER_NAME");
-   SetValueXML((char **)&LanguageXMLEnter_Host, "ENTER_HOST");
-   SetValueXML((char **)&LanguageXMLEnter_Ip, "ENTER_IP");
-   SetValueXML((char **)&LanguageXMLDownload_Config, "DOWNLAD_CONFIG");
-   SetValueXML((char **)&LanguageXMLDownload_Failed, "DOWNLAD_FAILED");
-   SetValueXML((char **)&LanguageXMLKill_All, "KILL_ALL");
-   SetValueXML((char **)&LanguageXMLSend_Config, "SEND_CONFIG");
-   SetValueXML((char **)&LanguageXMLUpload_Failed, "UPLOAD_FAILED");
-   SetValueXML((char **)&LanguageXMLNot_Save, "NOT_SAVE");
-   SetValueXML((char **)&LanguageXMLReboot_Failed, "REBOOT_FAILED");
-   SetValueXML((char **)&LanguageXMLConnect_Server, "CONNECT_SERVER");
-   SetValueXML((char **)&LanguageXMLLogin_Failed, "LOGIN_FAILED");
-   SetValueXML((char **)&LanguageXMLCannot_Connect, "CANNOT_CONNECT");
-   SetValueXML((char **)&LanguageXMLServer_Closed, "SERVER_CLOSED");
-   SetValueXML((char **)&LanguageXMLYes, "YES");
-   SetValueXML((char **)&LanguageXMLNo, "NO");
-
-   return 0;
-}
-
-///
-/// Close the xml file.
-/// This is called before LanguageEnd at the end of the program.
-///
-void LanguageXMLclose()
-{
-   if(loaded)
-     {
-	xmlFile.close();
-	loaded = false;
-     }
-}
-
-///
-/// The *hack* to load the correct xml file.
-/// This looks for the myserver.xml file and grabs the name of the
-/// lanugage file.  Then it tries to load that file in the default
-/// locations.
-///
-void LanguageXMLload()
-{
-   char languages_path[MAX_PATH];
-   char language_file[MAX_PATH];
-   char main_configuration_file[MAX_PATH];
-   char * chrptr;
-   XmlParser xmlFile;
-   bool langFound = true;
-   bool confFound = true;
-   int ret;
-
-   LanguageXMLinit();
-
-   // Find the language files:
-#ifdef WIN32
-   strncpy(languages_path, "languages/", MAX_PATH);
-#else
-   if(FilesUtility::fileExists("languages"))
-     {
-	strncpy(languages_path, "languages/", MAX_PATH);
-     }
-   else
-     {
-# ifdef PREFIX
-	snprintf(languages_path, MAX_PATH, "%s/share/myserver/languages/", PREFIX);
-# else
-	strncpy(languages_path, "/usr/share/myserver/languages/", MAX_PATH);
-# endif
-     }
-   if(!(FilesUtility::fileExists(languages_path)))
-     {
-	loadok = false;
-	langFound = false;
-	return;
-     }
-#endif
-
-   // Search for myserver.xml
-   /* Under an *nix environment look for .xml files in the following order.
-    * 1) myserver executable working directory
-    * 2) ~/.myserver/
-    * 3) /etc/myserver/
-    */
-#ifndef WIN32
-   // just a little hack
-   snprintf(main_configuration_file, MAX_PATH, "%s/.myserver/myserver.xml", getenv("HOME"));
-#endif
-   if(FilesUtility::fileExists("myserver.xml"))
-     {
-	strncpy(main_configuration_file,"myserver.xml", MAX_PATH);
-     }
-#ifndef WIN32
-   else if(FilesUtility::fileExists(main_configuration_file))
-     {
-	// do nothing
-     }
-   else if(FilesUtility::fileExists("/etc/myserver/myserver.xml"))
-     {
-	strncpy(main_configuration_file,"/etc/myserver/myserver.xml", MAX_PATH);
-     }
-#endif
-   else
-     {
-	confFound = false;
-	loadok = false;
-	return;
-     }
-
-   // Load the language file for configure
-   if(confFound && langFound)
-     {
-	xmlFile.open(main_configuration_file);
-	chrptr = xmlFile.getValue("LANGUAGE");
-	if(chrptr != NULL)
-	  snprintf(language_file, MAX_PATH, "%sconfigure/%s", languages_path, chrptr);
-	xmlFile.close();
-	ret = LanguageXMLfile(language_file);
-	if(ret)
-	  loadok = false;
-     }
-
-}
-
-///
-/// The do all function for translation.
-/// This automaticaly loads the correct language file on the first call.
-/// The tag is the english string that is mangled to an xml tag that is
-/// used to return the translated vr using the XmlParser class.
-///
-extern "C" char * ctrl_gettext(const char * tag)
-{
-   char * val;
-   char * text;
-
-   if(!loaded && loadok) // first call
-     {
-        LanguageXMLload();
-     }
-   if(!loadok) // failed first call
-     {
-#ifdef DEBUG
-	printf("Not Loaded, TAG: %s\n", tag);
-#endif
-	return (char *)tag;
-     }
-
-   // Get the translation
-   val = xmlFile.getValue((char *)textmangler(tag));
-   if(val == NULL)
-     {
-#ifdef DEBUG
-	printf("XML TAG <%s> Not Found!\n",textmangler(tag));
-	printf("<%s>%s</%s>\n",textmangler(tag),tag,textmangler(tag));
-#endif
-	return (char *)tag;
-     }
-#ifdef DEBUG
-   printf("TAG: %s VAL: %s\n", textmangler(tag), val);
-#endif
-
-   // allocate new memory and add to list
-   text = strdup(val);
-   AddText(text);
-
-   return text;
-}
-
-///
-/// Convert text into a xml tag.
-/// This mangles the english text to make an xml tag.
-/// Bufferin is the english string and returns a pointer to an internal
-/// string of the xml tag.
-/// This uses the frist 20 chars of bufferin with letters to upper case
-/// and nonletters to underscore (_).
-///
-inline const char * textmangler(const char * Bufferin)
-{
-   char Buffer[255];
-   static char Bufferout[255];
-   int val, i, len;
-
-   strncpy(Buffer, Bufferin, 255);
-   Buffer[20] = '\0';
-   len = strlen(Buffer);
-   strncat(Buffer, "%d", 255);
-   for(i = 0; i < len; i++)
-     {
-	if(Buffer[i] >= 'a' && Buffer[i] <= 'z')
-	  Buffer[i] -= 0x20;
-	else if(!(Buffer[i] >= 'A' && Buffer[i] <= 'Z'))
-	  Buffer[i] = '_';
-     }
-   len = strlen(Bufferin);
-   val = 0;
-   for(i = 0; i < len; i++)
-     {
-	val += Bufferin[i];
-	if(val > 255)
-	  val -= 255;
-     }
-   snprintf(Bufferout, 255, Buffer, val);
-
-   return Bufferout;
-}
-
diff --git a/misc/control/control/language.h b/misc/control/control/language.h
deleted file mode 100644
index 20560f2..0000000
--- a/misc/control/control/language.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004 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.
- 
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#ifndef LANGUAGE_H
-#define LANGUAGE_H
-
-#include <include/base/xml/xml_parser.h>
-
-void LanguageXMLinit();
-void LanguageXMLend();
-//int LanguageXMLfile(const char *);  // handeled internaly
-void LanguageXMLclose();
-
-extern const char * LanguageXMLLast_Change;
-extern const char * LanguageXMLNot_Found;
-extern const char * LanguageXMLReload_Prev;
-extern const char * LanguageXMLEnter_Default;
-extern const char * LanguageXMLAbout_Text;
-extern const char * LanguageXMLEnter_Extension;
-extern const char * LanguageXMLEnter_MIME;
-extern const char * LanguageXMLEnter_Name;
-extern const char * LanguageXMLEnter_Host;
-extern const char * LanguageXMLEnter_Ip;
-extern const char * LanguageXMLDownload_Config;
-extern const char * LanguageXMLDownload_Failed;
-extern const char * LanguageXMLKill_All;
-extern const char * LanguageXMLSend_Config;
-extern const char * LanguageXMLUpload_Failed;
-extern const char * LanguageXMLNot_Save;
-extern const char * LanguageXMLReboot_Failed;
-extern const char * LanguageXMLConnect_Server;
-extern const char * LanguageXMLLogin_Failed;
-extern const char * LanguageXMLCannot_Connect;
-extern const char * LanguageXMLServer_Closed;
-extern const char * LanguageXMLYes;
-extern const char * LanguageXMLNo;
-
-extern "C" char * ctrl_gettext(const char *) ;
-
-#endif
diff --git a/misc/control/control/mimetype.cpp b/misc/control/control/mimetype.cpp
deleted file mode 100644
index 89acabf..0000000
--- a/misc/control/control/mimetype.cpp
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- * MyServer
- * Copyright (C) 2002, 2003, 2004, 2007, 2008 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.
- *
- * 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 <string.h>
-extern "C"
-{
-#include <stdlib.h>
-}
-
-#include <include/base/file/file.h>
-#include <include/base/string/stringutils.h>
-#include <include/base/xml/xml_parser.h>
-#include "mimetype.h"
-
-using namespace std;
-
-//#define DEBUG
-
-const char * NONE = "NONE";
-
-///
-/// Constructor.
-///
-MIMEtypeXML::~MIMEtypeXML()
-{
-   Mime.clear();
-   ClearExt();
-}
-
-///
-/// Clear all memory.
-///
-void MIMEtypeXML::clear()
-{
-   Mime.clear();
-   ClearExt();
-}
-
-///
-/// Load the MIME types configuration file.
-/// Returns -1 on error.
-///
-int MIMEtypeXML::load(const char * filename)
-{
-   XmlParser parser;
-   if(parser.open((char *)filename)) // but I promis I wont modify
-     return -1;
-   int ret = load_core(parser);
-   parser.close();
-   return ret;
-}
-
-///
-/// Load the MIME types configuration from memory.
-/// returns -1 on error.
-///
-int MIMEtypeXML::loadMemBuf(MemBuf & buffer)
-{
-   XmlParser parser;
-   if(parser.openMemBuf(buffer))
-     return -1;
-   int ret = load_core(parser);
-   parser.close();
-   return ret;
-}
-
-///
-/// Load the values from xml data.
-/// Copied and modified from mime_manager.cpp
-/// Only returns 0.
-//  TODO: Change to use libxml2 or XmlParser more "proper"
-// 
-int MIMEtypeXML::load_core(XmlParser & parser)
-{
-   int extNumber = 0;
-
-   clear();
-
-   xmlDocPtr doc = parser.getDoc();
-   xmlNodePtr node=doc->children->children;
-   for(;node;node=node->next )
-     {
-	if(xmlStrcmp(node->name, (const xmlChar *)"MIMETYPE"))
-	  continue;
-	xmlNodePtr lcur=node->children;
-	while(lcur)
-	  {
-	     if(!xmlStrcmp(lcur->name, (const xmlChar *)"EXT"))
-	       {
-		  if(lcur->children->content)
-		    extNumber = addExt((char*)lcur->children->content);
-#ifdef DEBUG
-		  printf("EXT: %s, No: %d\n", (char*)lcur->children->content, extNumber);
-#endif
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"MIME"))
-	       {
-		  if(lcur->children->content)
-		    setType(extNumber, addMime((char*)lcur->children->content));
-#ifdef DEBUG
-		  printf("MIME: %s, No: %d, Result: %s, %d\n", (char*)lcur->children->content, extNumber, Mime.at(getType(extNumber))->Text, getType(extNumber));
-#endif
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"CMD"))
-	       {
-		  if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"SEND"))
-		    setCmd(extNumber, CMD_SEND);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"RUNCGI"))
-		    setCmd(extNumber, CMD_RUNCGI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"RUNMSCGI"))
-		    setCmd(extNumber, CMD_RUNMSCGI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"EXECUTE"))
-		    setCmd(extNumber, CMD_EXECUTE);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"RUNISAPI"))
-		    setCmd(extNumber, CMD_RUNISAPI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"EXECUTEISAPI"))
-		    setCmd(extNumber, CMD_EXECUTEISAPI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"SENDLINK"))
-		    setCmd(extNumber, CMD_SENDLINK);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"EXECUTEWINCGI"))
-		    setCmd(extNumber, CMD_EXECUTEWINCGI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"RUNFASTCGI"))
-		    setCmd(extNumber, CMD_RUNFASTCGI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"EXECUTEFASTCGI"))
-		    setCmd(extNumber, CMD_EXECUTEFASTCGI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"RUNSCGI"))
-		    setCmd(extNumber, CMD_RUNSCGI);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"EXECUTESCGI"))
-		    setCmd(extNumber, CMD_EXECUTESCGI);
-
-#ifdef DEBUG
-		  printf("CMD: %s, No: %d, Result: %d\n", (char*)lcur->children->content, extNumber, getCmd(extNumber));
-#endif
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"MANAGER"))
-	       {
-		  if(lcur->children->content)
-		    {
-		       if(strcmpi((char*)lcur->children->content,"NONE") == 0)
-			 setManager(extNumber, NONE);
-		       else
-			 setManager(extNumber, (char*)lcur->children->content);
-#ifdef DEBUG
-		       printf("MANAGER: %s, No: %d, Result: %s\n", (char*)lcur->children->content, extNumber, getManager(extNumber));
-#endif
-		    }
-	       }
-	     lcur=lcur->next;
-	  }
-	// while(lcur)
-     }
-   // for(;node;node=node->next )
-   Mime.sort();
-   
-   return 0;
-}
-
-///
-/// Save the MIME types configuration to file.
-/// Returns negative on error.
-///
-int MIMEtypeXML::save(const char * filename)
-{
-   XmlParser xmlFile;
-   int ret = save_core(xmlFile);
-   xmlFile.save((char *)filename); // But, but, but I promis
-   xmlFile.close();
-   return ret;
-}
-
-///
-/// Save the MIME types configuration to a memory buffer.
-/// Returns negative on error.
-///
-int MIMEtypeXML::saveMemBuf(MemBuf & buffer)
-{
-   XmlParser xmlFile;
-   int ret = save_core(xmlFile);
-   xmlFile.saveMemBuf(buffer);
-   xmlFile.close();
-   return ret;
-}
-   
-///
-/// Save the MIME types configuration to xml data.
-/// Returns negative on error.
-//  Copied and modified from mime_manager.cpp
-//  Old text way remove to make use of MemBuf
-// 
-int MIMEtypeXML::save_core(XmlParser & xmlFile)
-{
-   if(Ext.isempty())
-     return -1;
-
-   // New xml_parser way...
-   int i;
-   
-   xmlFile.newfile("MIMETYPES");
-   
-   for(i = 0; i < Ext.size(); i++)
-     {
-	xmlFile.addGroup("MIMETYPE");
-	xmlFile.addChild("EXT", Ext.at(i)->Text);
-	xmlFile.addChild("MIME", Mime.at(getType(i))->Text);
-	char command[16];
-	switch(getCmd(i))
-	  {
-	   case CMD_SEND:
-	     strncpy(command,"SEND",16);
-	     break;
-	   case CMD_RUNCGI:
-	     strncpy(command,"RUNCGI",16);
-	     break;
-	   case CMD_RUNMSCGI:
-	     strncpy(command,"RUNMSCGI",16);
-	     break;
-	   case CMD_EXECUTE:
-	     strncpy(command,"EXECUTE",16);
-	     break;
-	   case CMD_SENDLINK:
-	     strncpy(command,"SENDLINK",16);
-	     break;
-	   case CMD_RUNISAPI:
-	     strncpy(command,"RUNISAPI",16);
-	     break;
-	   case CMD_EXECUTEISAPI:
-	     strncpy(command,"EXECUTEISAPI",16);
-	     break;
-	   case CMD_EXECUTEWINCGI:
-	     strncpy(command,"EXECUTEWINCGI",16);
-	     break;
-	   case CMD_RUNFASTCGI:
-	     strncpy(command,"RUNFASTCGI",16);
-	     break;
-	   case CMD_EXECUTEFASTCGI:
-	     strncpy(command,"EXECUTEFASTCGI",16);
-	     break;
-	   case CMD_RUNSCGI:
-	     strncpy(command,"RUNSCGI",13);
-	     break;
-	   case CMD_EXECUTESCGI:
-	     strncpy(command,"EXECUTESCGI",11);
-	     break;
-	   default:
-	     break;
-	  }
-	xmlFile.addChild("CMD", command);
-	xmlFile.addChild("MANAGER", getManager(i));
-	xmlFile.endGroup();
-     }
-   
-   return 0;
-}
-
-///
-/// Populate the list box in the interface with the ext names.
-/// Takes a pointer to the Fl_Browser FLTK class.
-///
-void MIMEtypeXML::populateExt(Fl_Browser * o)
-{
-   o->clear();
-   for(int i = 0; i < Ext.size(); i++)
-     o->add(Ext.at(i)->Text);
-}
-
-///
-/// Populate the slection box in the interface with the MIME types.
-/// Takes a pointer to the Fl_Choice FLTK class.
-///
-void MIMEtypeXML::populateMime(Fl_Choice * o)
-{
-   o->clear();
-   int len, index;
-   char * chrptr;
-   for(int i = 0; i < Mime.size(); i++)
-     {  // Fl_Choice uses '/' as a seperatior so replace with ' '
-        chrptr = Mime.at(i)->Text;
-        len = strlen(chrptr) + 1;
-	char temp[len];
-	for(index = 0; index < len; index++)
-	  if(chrptr[index] == '/')
-	    temp[index] = ' ';
-	else
-	  temp[index] = chrptr[index];
-
-        o->add(temp, 0, 0, 0, 0);
-     }
-}
-
-///
-/// Adds an ext name to the ext list.
-/// If the ext given in name is already in the list, just return the
-/// location in the list.  Otherwise add the ext name and return the
-/// location in the list.
-///
-int MIMEtypeXML::addExt(const char * name)
-{
-   VectorNode * ret;
-   int i;
-   i = Ext.get(name);
-   if(i != -1)
-     return i;
-   MimeNode * NewNode = new MimeNode;
-   NewNode->Type = NULL;
-   NewNode->Cmd = 0;
-   NewNode->Manager = (char *)NONE;
-   ret = Ext.add(name, (void *)NewNode);
-   Ext.sort();
-   return ret->Number;
-}
-
-///
-/// Adds a MIME type to the MIME list.
-/// If the MIME given in name is already in the list, just return the
-/// location in the list.  Otherwise add the ext name and return the
-/// location in the list.
-///
-int MIMEtypeXML::addMime(const char * name)
-{
-   int i;
-   VectorNode * ret;
-   i = Mime.get(name);
-   if(i != -1)
-     return i;
-   ret = Mime.add(name);
-   Mime.sort();
-   return ret->Number;
-}
-
-///
-/// Removes an ext from the list.
-/// Takes the location number in the list.
-///
-void MIMEtypeXML::removeExt(int extNumber)
-{
-   DeleteMimeNode(((MimeNode *)(Ext.at(extNumber)->Data)));
-   Ext.remove(extNumber);
-}
-
-///
-/// Sets an ext to a MIME type.
-/// extNumber is the location number of the ext.
-/// mimeNumber is the location number of the MIME type.
-///
-void MIMEtypeXML::setType(int extNumber, int mimeNumber)
-{
-   ((MimeNode *)(Ext.at(extNumber)->Data))->Type = Mime.at(mimeNumber);
-}
-
-///
-/// Sets the command type of the ext.
-/// extNumber is the location number of the ext.
-/// cmdNumber is the enum of the command.  See mimetype.h
-///
-void MIMEtypeXML::setCmd(int extNumber, int cmdNumber)
-{
-   ((MimeNode *)(Ext.at(extNumber)->Data))->Cmd = cmdNumber;
-}
-
-///
-/// Sets the cgi manager for the ext.
-/// extNumber is the location number of the ext.
-/// name is the compleate path and exe name of the manager.
-///
-void MIMEtypeXML::setManager(int extNumber, const char * name)
-{
-   char * chrptr = ((MimeNode *)(Ext.at(extNumber)->Data))->Manager;
-   if(chrptr != NULL && chrptr != NONE)
-     free(chrptr);
-   if(name != NONE)
-     ((MimeNode *)(Ext.at(extNumber)->Data))->Manager = strdup(name);
-   else
-     ((MimeNode *)(Ext.at(extNumber)->Data))->Manager = (char *)NONE;
-}
-
-///
-/// Gets the MIME type of the ext.
-/// Takes the location number of the ext and returns the MIME 
-/// location number.
-///
-int MIMEtypeXML::getType(int extNumber)
-{
-   VectorNode * ret = ((MimeNode *)(Ext.at(extNumber)->Data))->Type;
-   if(ret == NULL)
-     return 0;
-   return ret->Number;
-}
-
-///
-/// Gets the cgi command type of the ext.
-/// Takes the location number of the ext and returns the command type
-/// number. (see mimetype.h)
-///
-int MIMEtypeXML::getCmd(int extNumber)
-{
-   return ((MimeNode *)(Ext.at(extNumber)->Data))->Cmd;
-}
-
-///
-/// Gets the cgi manager of the ext.
-/// Takes the location number of the ext and returns a pointer to an internal
-/// string of the manager with compleat path.
-///
-const char * MIMEtypeXML::getManager(int extNumber)
-{
-   return ((MimeNode *)(Ext.at(extNumber)->Data))->Manager;
-}
-
-///
-/// Clear the ext list.
-///
-void MIMEtypeXML::ClearExt()
-{
-   int i;
-   for(i = 0; i < Ext.size(); i++)
-     {
-	DeleteMimeNode((MimeNode *)(Ext.at(i)->Data));
-     }
-   Ext.clear();
-}
-
-///
-/// Remove a MIME type.
-/// Take a pointer to the MIME type node.
-///
-void MIMEtypeXML::DeleteMimeNode(MimeNode * Node)
-{
-   if(Node->Manager != NULL && Node->Manager != NONE)
-     free(Node->Manager);
-   delete Node;
-}
diff --git a/misc/control/control/mimetype.h b/misc/control/control/mimetype.h
deleted file mode 100644
index a82eff8..0000000
--- a/misc/control/control/mimetype.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004, 2007 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.
- 
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#ifndef MIMETYPE_H_CONF
-#define MIMETYPE_H_CONF
-
-#include <FL/Fl.H>
-#include <FL/Fl_Browser.H>
-#include <FL/Fl_Choice.H>
-
-#include "vector.h"
-#include <include/base/mem_buff/mem_buff.h>
-#include <include/base/xml/xml_parser.h>
-
-///
-/// CGI command type numbers.
-///
-enum
-{
-   CMD_SEND = 0,
-   CMD_SENDLINK,
-   CMD_RUNCGI,
-   CMD_RUNFASTCGI,
-   CMD_RUNSCGI,
-   CMD_RUNISAPI,
-   CMD_RUNMSCGI,
-   CMD_EXECUTEWINCGI,
-   CMD_EXECUTE,
-   CMD_EXECUTEISAPI,
-   CMD_EXECUTEFASTCGI,
-   CMD_EXECUTESCGI
-
-};
-
-///
-/// A pointer used to spesify "NONE"
-///
-extern const char * NONE;
-
-///
-/// MIME type node.
-/// This is used to store the MIME type data for each ext.
-///
-struct MimeNode
-{
-   VectorNode * Type;  /// Pointer to the MIME type.
-   int Cmd;            /// The cgi command number.
-   char * Manager;     /// The cgi manager string.
-};
-
-///
-/// Loads and saves the MIME type configuration and manipulate the data.
-/// 
-class MIMEtypeXML
-{
- public:
-   ~MIMEtypeXML();
-   void clear();
-   int load(const char *);
-   int loadMemBuf(MemBuf &);
-   int load_core(XmlParser &);
-   int save(const char *);
-   int saveMemBuf(MemBuf &);
-   int save_core(XmlParser &);
-   void populateExt(Fl_Browser *);
-   void populateMime(Fl_Choice *);
-   int addExt(const char *);
-   int addMime(const char *);
-   void removeExt(int );
-   void setType(int, int);
-   void setCmd(int, int);
-   void setManager(int, const char *);
-   int getType(int);
-   int getCmd(int);
-   const char * getManager(int);
- private:
-   void ClearExt();
-   void DeleteMimeNode(MimeNode *);
-   Vector Mime;
-   Vector Ext;
-};
-
-#endif
diff --git a/misc/control/control/myserver-configure.cpp b/misc/control/control/myserver-configure.cpp
deleted file mode 100644
index 4d43465..0000000
--- a/misc/control/control/myserver-configure.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2008 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.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef WIN32
-# include <windows.h>
-# include <io.h>
-#endif
-
-#include <Fl/Fl.H>
-#include <Fl/fl_ask.H>
-
-#include "language.h"
-#include <include/base/string/stringutils.h>
-#include <include/base/xml/xml_parser.h>
-#include <include/base/file/file.h>
-#include <include/base/file/files_utility.h>
-#include "vector.h"
-#include "fltkconfig.h"
-#include "language.h"
-
-#include <include/base/find_data/find_data.h>
-
-extern "C"
-{
-#include <stdio.h>
-#ifdef WIN32
-# include <direct.h>
-#elif HAVE_DL
-# include <dlfcn.h>
-# define HMODULE void *
-#else
-# define HMODULE void *
-#endif
-}
-
-#ifndef intptr_t
-# define intptr_t int
-#endif
-
-typedef char* (*registerNamePROC)(char*,int);
-
-static void GetDynamicProtocols(const char *, Vector &);
-
-///
-/// Main function.
-/// Intilize all supporting libraries and windows.
-/// Gets the list of dynamic protocols and language files.
-/// Loads the first avaible configuration.
-/// Displays the main dialog.
-/// Waits for FLTK to quit and dose clean up.
-///
-int main(int argc, char * argv[])
-{
-   char languages_path[MAX_PATH];
-   char main_configuration_file[MAX_PATH];
-   int conf_location = 0;
-   XmlParser xmlFile;
-   FindData fd;
-   int fd_ret;
-   bool langFound = true;
-   bool confFound = true;
-   int ret;
-
-  LanguageXMLinit();
-   /*! Initialize the SSL library. */
-#ifndef DO_NOT_USE_SSL
-   SSL_library_init();
-   SSL_load_error_strings();
-#endif
-
-#ifdef WIN32	
-	/*!
-   *Under windows we need to initialize the socket library before use it.
-   */
-	WSADATA wsaData;
-	WSAStartup(MAKEWORD( 1, 1), &wsaData);
-
-   // Find the language files:
-   strncpy(languages_path, "languages/", MAX_PATH);
-   fd_ret=fd.findfirst("languages/");
-#else
-   if(FilesUtility::fileExists("languages"))
-     {
-	strncpy(languages_path, "languages/", MAX_PATH);
-     }
-   else
-     {
-# ifdef PREFIX
-	snprintf(languages_path, MAX_PATH, "%s/share/myserver/languages/", PREFIX);
-# else
-	strncpy(languages_path, "/usr/share/myserver/languages/", MAX_PATH);
-# endif
-     }
-   if(!(FilesUtility::fileExists(languages_path)))
-     {
-	fl_alert("Languages directory not found.");
-	langFound = false;
-     }
-   if(langFound)
-     fd_ret=fd.findfirst(languages_path);
-#endif
-
-   // Search for myserver.xml
-   /* 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
-    */
-#ifndef WIN32
-   // just a little hack
-   snprintf(main_configuration_file, MAX_PATH, "%s/.myserver/myserver.xml", getenv("HOME"));
-#endif
-   if(FilesUtility::fileExists("myserver.xml"))
-     {
-	conf_location = 1;
-	strncpy(main_configuration_file,"myserver.xml", MAX_PATH);
-     }
-#ifndef WIN32
-   else if(FilesUtility::fileExists(main_configuration_file))
-     {
-	conf_location = 2;
-     }
-   else if(FilesUtility::fileExists("/etc/myserver/myserver.xml"))
-     {
-	conf_location = 3;
-	strncpy(main_configuration_file,"/etc/myserver/myserver.xml", MAX_PATH);
-     }
-#endif
-     /*
-      * If the myserver.xml files doesn't exist copy it from the default one.
-      */
-   else
-     {
-	conf_location = 1;
-	strncpy(main_configuration_file,"myserver.xml", MAX_PATH);
-	File inputF;
-	File outputF;
-	if(!FilesUtility::fileExists("myserver.xml.default"))
-	  {  // no configuration files found
-	     fl_alert("Default configuration files not found.  Loading empty values.");
-	     confFound = false;
-	     conf_location = 0;
-	  }
-	else
-	  {  // Copy the default files
-	     char buffer[512];
-	     u_long nbr, nbw;
-	     fl_alert("Configuration files not found.  Loading default files.");
-	     inputF.openFile("myserver.xml.default", File::MYSERVER_OPEN_READ|File::MYSERVER_OPEN_IFEXISTS);
-	     outputF.openFile("myserver.xml", File::MYSERVER_OPEN_WRITE|File::MYSERVER_OPEN_ALWAYS);
-	     for(;;)
-	       {
-		  inputF.read(buffer, 512, &nbr );
-		  if(nbr==0)
-		    break;
-		  outputF.writeToFile(buffer, nbr, &nbw);
-	       }
-	     inputF.close();
-	     outputF.close();
-
-	     if(FilesUtility::fileExists("MIMEtypes.xml.default"))
-	       {
-		  char buffer[512];
-		  u_long nbr, nbw;
-		  inputF.openFile("MIMEtypes.xml.default", File::MYSERVER_OPEN_READ|File::MYSERVER_OPEN_IFEXISTS);
-		  outputF.openFile("MIMEtypes.xml", File::MYSERVER_OPEN_WRITE|File::MYSERVER_OPEN_ALWAYS);
-		  for(;;)
-		    {
-		       inputF.read(buffer, 512, &nbr );
-		       if(nbr==0)
-			 break;
-		       outputF.writeToFile(buffer, nbr, &nbw);
-		    }
-		  inputF.close();
-		  outputF.close();
-	       }
-
-	     if(FilesUtility::fileExists("virtualhosts.xml.default"))
-	       {
-		  char buffer[512];
-		  u_long nbr, nbw;
-		  inputF.openFile("virtualhosts.xml.default", File::MYSERVER_OPEN_READ|
-											File::MYSERVER_OPEN_IFEXISTS);
-		  outputF.openFile("virtualhosts.xml", File::MYSERVER_OPEN_WRITE| 
-											 File::MYSERVER_OPEN_ALWAYS);
-		  for(;;)
-		    {
-		       inputF.read(buffer, 512, &nbr );
-		       if(nbr==0)
-			 break;
-		       outputF.writeToFile(buffer, nbr, &nbw);
-		    }
-		  inputF.close();
-		  outputF.close();
-	       }
-	  }
-     }
-
-   // Initilize APIs
-   XmlParser::startXML();
-   // LanguageXMLinit handeled internaly
-
-   // Load the language file for configure
-   // Handeled internaly
-
-
-   // Initilize the Dialogs
-   MainDlg Configure;
-   Configure.make_window();
-   Configure.make_about();
-   Configure.make_type();
-   Configure.make_login();
-   Configure.make_status();
-   Configure.make_connections();
-   Configure.make_regask();
-   
-   // Show the main window
-   Configure.ConfDlg->show(argc, argv);
-
-   // Load the language file names
-   Configure.Language->clear();
-   if(langFound)
-     {
-	do
-	  {
-	     char dir[MAX_PATH];
-	     char filename[MAX_PATH];
-	     if(fd.name[0] == '.')
-	       continue;
-	     FilesUtility::splitPath(fd.name,dir,filename);
-	     if(strcmpi(&(filename[strlen(filename) - 3]), "xml") == 0)
-	       Configure.Language->add(filename, 0, 0, 0, 0);
-	  }
-	while(!fd.findnext());
-	fd.findclose();
-     }
-   
-   // Load the dynamic protocol names
-   Vector list;
-   if(FilesUtility::fileExists("plugins/protocols"))
-     {
-	GetDynamicProtocols("plugins/protocols", list);
-     }
-#ifndef WIN32
-#ifdef PREFIX
-   else if(FilesUtility::fileExists(PREFIX "/lib/myserver/plugins/protocols"))
-     {
-	GetDynamicProtocols(PREFIX "/lib/myserver/plugins/protocols", list);
-     }
-#else
-   else if(FilesUtility::fileExists("/usr/lib/myserver/plugins/protocols"))
-     {
-	GetDynamicProtocols("/usr/lib/myserver/plugins/protocols", list);
-     }
-#endif
-#endif
-   Configure.setDynamic(list);
-   list.clear();
-
-   // Load, if found, fist avaible configuration
-   Configure.ConfType = conf_location;
-   switch(conf_location)
-     {
-      case 1 :
-	Configure.ConfTypeDlgLocal->setonly();
-	break;
-      case 2 :
-	Configure.ConfTypeDlgUser->setonly();
-	break;
-      case 3 :
-	Configure.ConfTypeDlgGlobal->setonly();
-	break;
-      default :
-	break;
-     }
-   Configure.load_config();
-
-   // Start the app
-   ret = Fl::run();
-
-   // Close the language xml file
-   LanguageXMLclose();
-
-   // Cleanup
-   LanguageXMLend();
-   XmlParser::cleanXML();
-
-   // Exit
-   return ret;
-}
-
-///
-/// Get the local dynamic protocols.
-/// Parts taken from protocols_manager.cpp
-/// 
-static void GetDynamicProtocols(const char * folder, Vector & list)
-{
-   list.clear();
-
-   HMODULE module;
-   registerNamePROC name;
-
-   FindData fd;
-   int fd_ret;   
-   int filenamelen = 0;
-   char *filename = 0;
-#ifdef WIN32
-   filenamelen=strlen(folder)+6;
-   filename=new char[filenamelen];
-   if(filename == 0)
-     return;
-   snprintf(filename,filenamelen,"%s/*.*",folder);
-#endif
-#ifdef NOT_WIN
-   filenamelen=strlen(folder)+2;
-   filename=new char[filenamelen];
-   if(filename == 0)
-     return;
-   strncpy(filename,folder, filenamelen);
-#endif
-
-   fd_ret=fd.findfirst(filename);
-   if(fd_ret==-1)
-       {
-	  delete [] filename;
-	  filename = 0;
-	  return;
-       }
-   char *completeFileName = 0;
-   int completeFileNameLen = 0;
-   do
-     {
-	if(fd.name[0]=='.')
-	  continue;
-	/*
-	 *Do not consider file other than dynamic libraries.
-	 */
-#ifdef WIN32
-	if(!strstr(fd.name,".dll"))
-#endif
-#ifdef NOT_WIN
-	  if(!strstr(fd.name,".so"))
-#endif
-	    continue;
-	completeFileNameLen = strlen(folder) + strlen(fd.name) + 2;
-	completeFileName = new char[completeFileNameLen];
-	if(completeFileName == 0)
-	  {
-	     delete [] filename;
-	     filename = 0;
-	     return;
-	  }
-	snprintf(completeFileName,completeFileNameLen,"%s/%s",folder,fd.name);
-#ifdef WIN32
-	module = LoadLibrary(completeFileName);
-#endif
-#ifdef HAVE_DL
-	module = dlopen(completeFileName, RTLD_LAZY);
-#endif
-	if(module != NULL)
-	  {
-#ifdef WIN32
-	     name = (registerNamePROC)GetProcAddress((HMODULE)module, "registerName");
-#endif
-#ifdef HAVE_DL
-	     name = (registerNamePROC)dlsym(module, "registerName");
-#endif
-	     if(name != NULL)
-	       {
-		  list.add(name(NULL, 0));
-	       }
-	  }
-#ifdef WIN32
-	FreeLibrary((HMODULE)module);
-#endif
-#ifdef HAVE_DL
-	dlclose(module);
-#endif
-	delete [] completeFileName;
-     }
-   while(!fd.findnext());
-   fd.findclose();
-   delete [] filename;
-   filename = 0;
-}
diff --git a/misc/control/control/progress.cpp b/misc/control/control/progress.cpp
deleted file mode 100644
index d172473..0000000
--- a/misc/control/control/progress.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-  MyServer
-  Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
- 
-  This library 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
-  Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  */
-#ifndef PROGRESS_H
-#define PROGRESS_H
-
-#include <FL/Fl.H>
-#include <FL/Fl_Progress.H>
-#include <stdio.h>
-
-///
-/// Status callback function.
-/// This updates the progress dialog in the interface.
-/// object is the pointer to the Fl_Progress FLTK class.
-/// len is the end value of the progress.
-/// pos is the current value of progress.
-///
-void ProgressCallback(void * Object, unsigned int len, unsigned int pos)
-{
-   Fl_Progress * o = (Fl_Progress *)Object;  
-   static char buffer[5];
-   int stat = (int)((float)pos / (float)len * 100.0);
-   snprintf(buffer, 5, "%d%%", stat);
-   o->value(stat);
-   o->label(buffer);
-   // make sure fltk updates the display
-   Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);
-//   Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);
-//   Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);Fl::wait(0);
-}
-
-#endif
diff --git a/misc/control/control/progress.h b/misc/control/control/progress.h
deleted file mode 100644
index a1322da..0000000
--- a/misc/control/control/progress.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-  MyServer
-  Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
- 
-  This library 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
-  Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  */
-#ifndef PROGRESS_H
-#define PROGRESS_H
-
-#include <FL/Fl.H>
-#include <FL/Fl_Progress.H>
-#include <stdio.h>
-
-/* Status callback function */
-
-void ProgressCallback(void * Object, unsigned int len, unsigned int pos);
-#endif
diff --git a/misc/control/control/service.cpp b/misc/control/control/service.cpp
deleted file mode 100644
index 7d84788..0000000
--- a/misc/control/control/service.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * MyServer
- * Copyright (C) 2002, 2003, 2004, 2006 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *  *
- */
-
-// Helper functions for the configure program
-
-#ifdef WIN32
-#include <windows.h>
-#else
-extern "C" { 
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-}
-#endif
-
-#include <include/base/file/file.h>
-#include <include/base/file/files_utility.h>
-
-#ifdef WIN32
-static DWORD WINAPI consoleWatchDogThread(LPVOID);
-static HANDLE consoleModeWatchDog;
-static STARTUPINFO si;
-static PROCESS_INFORMATION pi;
-static SERVICE_STATUS          MyServiceStatus;
-static SERVICE_STATUS_HANDLE   MyServiceStatusHandle;
-#else
-static int ConsolePid = 0;
-#endif
-
-void RunAsConsole()
-{
-#ifdef WIN32
-   CreateProcess(NULL,"myserver.exe CONSOLE",NULL,NULL,FALSE,0,0,0,&si,&pi);
-   DWORD id;
-   consoleModeWatchDog = CreateThread(0,0,consoleWatchDogThread,0,0,&id);
-#else
-   int pid = fork();
-   if(pid == 0)
-     {
-	if(FilesUtility::fileExists("myserver"))
-	  execlp("xterm", "xterm", "-e", "./myserver", NULL);
-	else
-	  execlp("xterm", "xterm", "-e", "myserver", NULL);
-	exit(0);
-     }
-   ConsolePid = pid;
-#endif
-}
-
-void RunAsService()
-{
-#ifdef WIN32
-   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);
-	     while (QueryServiceStatus (service, &MyServiceStatus))
-	       if (MyServiceStatus.dwCurrentState != SERVICE_START_PENDING)
-		 break;
-	     CloseServiceHandle (service);
-	     CloseServiceHandle (manager);
-	  }
-     }
-#endif
-}
-
-void StopConsole()
-{
-#ifdef WIN32
-   if(pi.hProcess)
-     TerminateProcess(pi.hProcess,0);
-#else
-   if(ConsolePid != 0)
-     kill(ConsolePid, SIGTERM);
-#endif
-}
-
-void StopService()
-{
-#ifdef WIN32
-   SC_HANDLE service,manager;
-   manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
-   if (manager)
-     {
-	service = OpenService (manager, "MyServer", SERVICE_ALL_ACCESS);
-	if (service)
-	  {
-	     ControlService (service,SERVICE_CONTROL_STOP,&MyServiceStatus);
-	     while (QueryServiceStatus (service, &MyServiceStatus))
-	       if (MyServiceStatus.dwCurrentState != SERVICE_STOP_PENDING)
-		 break;
-	     CloseServiceHandle (service);
-	     CloseServiceHandle (manager);
-	  }
-     }
-#endif
-}
-
-void InstallService()
-{
-#ifdef WIN32
-   SC_HANDLE service,manager;
-   char path [MAX_PATH];
-   GetCurrentDirectory(MAX_PATH,path);
-   lstrcat(path,"\\");
-   lstrcat(path,"myServer.exe SERVICE");
-
-   manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
-   if (manager)
-     {
-	service = CreateService(manager,"MyServer","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);
-     }
-     /*Run the service after its installation. */
-     RunAsService();
-#endif
-}
-
-void RemoveService()
-{
-#ifdef WIN32
-   SC_HANDLE service,manager;
-   manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
-   if (manager)
-     {
-	service = OpenService (manager, "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
-}
-
-#ifdef WIN32
-/*!
- * *Wait if the myServer application is ended by itself.
- * */
-DWORD WINAPI consoleWatchDogThread(LPVOID param)
-{
-   
-   WaitForSingleObject(pi.hProcess,INFINITE);
-   TerminateThread(GetCurrentThread(),0);
-   return 0;
-}
-
-#endif
diff --git a/misc/control/control/service.h b/misc/control/control/service.h
deleted file mode 100644
index c9feb97..0000000
--- a/misc/control/control/service.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004 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.
- 
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#ifndef SERVICE_H
-#define SERVICE_H
-
-void RunAsConsole();
-void RunAsService();
-void StopConsole();
-void StopService();
-void InstallService();
-void RemoveService();
-
-#endif
diff --git a/misc/control/control/textmangler/textmangler.cpp b/misc/control/control/textmangler/textmangler.cpp
deleted file mode 100644
index a049c24..0000000
--- a/misc/control/control/textmangler/textmangler.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004 The MyServer Team
- 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.
- 
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-// Compile with g++ -o textmangler textmangler.cpp `xml2-config --cflags --libs`
-// Run with textmangler textfile.txt languagefile.xml
-// Where textfile.txt is the english prases in the program to use
-// gettext in language.cpp
-
-#include <iostream>
-#include <fstream>
-#include <cstdio>
-#include <cstring>
-
-extern "C" 
-{   
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-}
-
-
-using namespace std;
-
-int main(int argn, char * argv[])
-{
-   char Buffer[255];
-   char Bufferin[255];
-   char Bufferout[255];
-   int val;
-   int i, len;
-   
-   xmlDocPtr doc;
-   xmlNodePtr cur;
-   
-   if(argn < 3)
-     return -1;
-   
-   fstream filein, fileout;
-   
-   filein.open(argv[1], ios::in);
-   if(!filein)
-     return -1;
-
-   xmlInitParser();
-   
-   doc = xmlNewDoc((const xmlChar*)"1.0");
-   cur = xmlNewDocNode(doc, NULL, (const xmlChar*)"MYSERVER_LANGUAGE_FILE", NULL);
-   xmlDocSetRootElement(doc, cur);
-   
-   filein.getline(Bufferin, 255);
-   while(!filein.eof())
-     {
-	strncpy(Buffer, Bufferin, 255);
-	Buffer[20] = '\0';
-	len = strlen(Buffer);
-	strncat(Buffer, "%d", 255);
-	for(i = 0; i < len; i++)
-	  {
-	     if(Buffer[i] >= 'a' && Buffer[i] <= 'z')
-	       Buffer[i] -= 0x20;
-	     else if(!(Buffer[i] >= 'A' && Buffer[i] <= 'Z'))
-	       Buffer[i] = '_';
-	  }
-	len = strlen(Bufferin);
-	val = 0;
-	for(i = 0; i < len; i++)
-	  {
-	     val += Bufferin[i];
-	     if(val > 255)
-	       val -= 255;
-	  }
-	snprintf(Bufferout, 255, Buffer, val);
-	
-	xmlNewTextChild(cur, NULL, (const xmlChar*)Bufferout, (const xmlChar*)Bufferin);
-	
-	filein.getline(Bufferin, 255);
-     }
-   filein.close();
-   xmlSaveFile(argv[2], doc);
-   xmlFreeDoc(doc);
-   return 0;
-}
diff --git a/misc/control/control/tmp/keepme b/misc/control/control/tmp/keepme
deleted file mode 100644
index e0808fa..0000000
--- a/misc/control/control/tmp/keepme
+++ /dev/null
@@ -1 +0,0 @@
-keep me
diff --git a/misc/control/control/vector.cpp b/misc/control/control/vector.cpp
deleted file mode 100644
index 6aadcb0..0000000
--- a/misc/control/control/vector.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004 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.
-
- 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 <string.h>
-extern "C"
-{
-#include <stdlib.h>
-}
-#include "vector.h"
-
-Vector::Vector()
-{
-   Array = NULL;
-   VectorSize = 0;
-   Sorted = false;
-}
-
-Vector::~Vector()
-{
-   clear();
-}
-
-VectorNode * Vector::add(const char * Text, void * Data)
-{
-   int i;
-
-   VectorNode * NewNode = new VectorNode;
-   NewNode->Text = strdup(Text);
-   NewNode->Data = Data;
-   NewNode->Number = VectorSize;
-
-   VectorNode ** NewArray = (VectorNode **) new void*[sizeof(VectorNode *)*(VectorSize + 1)];
-   for(i = 0; i < VectorSize; i++)
-     NewArray[i] = Array[i];
-
-   NewArray[i] = NewNode;
-   delete Array;
-   Array = NewArray;
-   VectorSize++;
-   Sorted = false;
-   return NewNode;
-}
-
-void Vector::add(Vector & cpy)
-{
-   for(int i = 0; i < cpy.size(); i++)
-     {
-	add(cpy.at(i)->Text, cpy.at(i)->Data);
-     }
-}
-
-void Vector::remove(int index)
-{
-   if(VectorSize == 0)
-     return;
-   if(index > VectorSize)
-     return;
-
-   if(VectorSize - 1 == 0)
-     {
-	clear();
-	return;
-     }
-
-   VectorNode ** NewArray = (VectorNode **) new void*[sizeof(VectorNode *)*(VectorSize - 1)];
-
-   int a, b;
-   a = b = 0;
-   for(a = 0; a < VectorSize; a++)
-     {
-	if(a == index)
-	  {
-	     DeleteNode(Array[a]);
-	     a++;
-	  }
-	NewArray[b] = Array[a];
-	b++;
-     }
-   delete Array;
-   Array = NewArray;
-   VectorSize--;
-   ReCount();
-}
-
-void Vector::clear()
-{
-   if(VectorSize == 0)
-     return;
-   int i;
-   for(i = 0; i < VectorSize; i++)
-     DeleteNode(Array[i]);
-   delete Array;
-   Array = NULL;
-   VectorSize = 0;
-   Sorted = false;
-}
-
-int Vector::size()
-{
-   return VectorSize;
-}
-
-// q_sort example from Michael Lamont (GPL)
-// http://linux.wku.edu/~lamonml/algor/sort/quick.c
-// 
-// Modifed to work with Vector class
-static void q_sort(VectorNode ** Array, int left, int right)
-{
-
-   int index, l_hold, r_hold;
-
-   VectorNode * pivot;
-   
-   l_hold = left;
-   r_hold = right;
-   pivot = Array[left];
-   while (left < right)
-     {
-	while (strcmp(Array[right]->Text, pivot->Text) >= 0 && (left < right))
-	  right--;
-	if (left != right)
-	  {
-	     Array[left] = Array[right];
-	     left++;
-	  }
-	while (strcmp(Array[left]->Text, pivot->Text) <= 0 && (left < right))
-	  left++;
-	if (left != right)
-	  {
-	     Array[right] = Array[left];
-	     right--;
-	  }
-     }
-   Array[left] = pivot;
-   index = left;
-   left = l_hold;
-   right = r_hold;
-   if (left < index)
-     q_sort(Array, left, index-1);
-   if (right > index)
-     q_sort(Array, index+1, right);
-}
-
-// sort using QuickSort
-void Vector::sort()
-{
-   if(Sorted)
-     return;
-   if(VectorSize < 2)
-     return;
-   
-   q_sort(Array, 0, VectorSize - 1);
-   
-   ReCount();
-   Sorted = true;
-}
-
-VectorNode * Vector::at(int index)
-{
-   if(index >= VectorSize)
-     return NULL;
-   return Array[index];
-}
-
-// sorted binary search
-int Vector::get(const char * Text)
-{
-   if(VectorSize == 0)
-     return -1;
-   if(!Sorted)
-     sort();
-
-   int high, low, center, ret;
-   high = VectorSize - 1;
-   low = 0;
-
-   while(low <= high)
-     {
-	center = (low + high) / 2;
-	ret = strcmp(Text, Array[center]->Text);
-	if(ret == 0)
-	  return center;
-	else if(ret < 0)
-	  high = center - 1;
-	else
-	  low = center + 1;
-     }
-
-   return -1;
-}
-
-bool Vector::isempty()
-{
-   if(VectorSize == 0)
-     return true;
-   else
-     return false;
-}
-
-void Vector::DeleteNode(VectorNode * Node)
-{
-   free(Node->Text);
-   delete Node;
-}
-
-void Vector::ReCount()
-{
-   for(int i = 0; i < VectorSize; i++)
-     {
-	Array[i]->Number = i;
-     }
-}
-
diff --git a/misc/control/control/vector.h b/misc/control/control/vector.h
deleted file mode 100644
index 5ca80c6..0000000
--- a/misc/control/control/vector.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- MyServer
- Copyright (C) 2002, 2003, 2004 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.
- 
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#ifndef VECTOR_H_SOME_GARBAGE_HERE
-#define VECTOR_H_SOME_GARBAGE_HERE
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-struct VectorNode
-{
-   char * Text;
-   int Number;
-   void * Data;
-};
-
-
-// Since VC++'s STL is buggy...
-class Vector
-{
- public:
-   Vector();
-   ~Vector();
-   VectorNode * add(const char * Text, void * Data = NULL);
-   void add(Vector &);
-   void remove(int );  // you must free/delete "Data"
-   void clear();       // before calling
-   int size();
-   void sort();  // Sort A-z using "Text"
-   VectorNode * at(int );  // Returns NULL on out of bounds
-   int get(const char *);  // Returns index of text search or -1 on failure
-   bool isempty();
- private:
-   void DeleteNode(VectorNode *);
-   void ReCount();
-   VectorNode ** Array;
-   int VectorSize;
-   bool Sorted;
-};
-
-#endif
diff --git a/misc/control/control/vhost.cpp b/misc/control/control/vhost.cpp
deleted file mode 100644
index 39e3aa6..0000000
--- a/misc/control/control/vhost.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
- * MyServer
- * Copyright (C) 2002, 2003, 2004, 2007 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.
- *
- * 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 <string.h>
-extern "C"
-{
-#include <stdlib.h>
-}
-
-#include <include/base/file/file.h>
-#include <include/base/string/stringutils.h>
-#include <include/base/xml/xml_parser.h>
-#include "vhost.h"
-
-using namespace std;
-
-const char * EMPTY = "";
-
-VHostXML::~VHostXML()
-{
-   clear();
-   Dynamic.clear();
-}
-
-void VHostXML::clear()
-{
-   for(int i = 0; i < VHosts.size(); i++)
-     DeleteVHostNode((VHostNode *)(VHosts.at(i)->Data));
-   VHosts.clear();
-}
-
-int VHostXML::load(const char * filename)
-{
-   XmlParser parser;
-   if(parser.open((char *)filename))  // But I promis not to change filename
-     return -1;
-   
-   int ret = load_core(parser);
-   parser.close();
-   return ret;
-}
-
-int VHostXML::loadMemBuf(MemBuf & buffer)
-{
-   XmlParser parser;
-   if(parser.openMemBuf(buffer))
-     return -1;
-   
-   int ret = load_core(parser);
-   parser.close();
-   return ret;
-}
-
-// from vhosts.cpp with modification
-// TODO: Change to use libxml2 or xml_parser more "proper"
-int VHostXML::load_core(XmlParser & parser)
-{
-   int NameNo = 0;
-
-   clear();
-   
-   xmlDocPtr doc = parser.getDoc();
-   xmlNodePtr node=doc->children->children;
-   for(;node;node=node->next )
-     {
-	if(xmlStrcmp(node->name, (const xmlChar *)"VHOST"))
-	  continue;
-
-	xmlNodePtr lcur=node->children;
-
-	while(lcur)
-	  {
-	     if(!xmlStrcmp(lcur->name, (const xmlChar *)"HOST"))
-	       {
-		  bool useRegex = false;
-		  xmlAttr *attrs = lcur->properties;
-		  while(attrs)
-		    {
-		       if(!xmlStrcmp(attrs->name, (const xmlChar *)"isRegex"))
-			 {
-			    if(attrs->children && attrs->children->content &&
-			       (!xmlStrcmp(attrs->children->content, (const xmlChar *)"YES")))
-			      {
-				 useRegex = true;
-			      }
-			 }
-		       attrs=attrs->next;
-		    }
-		  addHost(NameNo, (char*)lcur->children->content, useRegex);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"NAME"))
-	       {
-		  NameNo = addName((char*)lcur->children->content);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SSL_PRIVATEKEY"))
-	       {
-		  setSsl_Privatekey(NameNo, (char*)lcur->children->content);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SSL_CERTIFICATE"))
-	       {
-		  setSsl_Certificate(NameNo, (char*)lcur->children->content);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SSL_PASSWORD"))
-	       {
-		  if(lcur->children)
-		    setSsl_Password(NameNo, (char*)lcur->children->content);
-		  else
-		    setSsl_Password(NameNo, (char*)EMPTY);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"IP"))
-	       {
-		  bool useRegex = false;
-		  xmlAttr *attrs =  lcur->properties;
-		  while(attrs)
-		    {
-		       if(!xmlStrcmp(attrs->name, (const xmlChar *)"isRegex"))
-			 {
-			    if(attrs->children && attrs->children->content &&
-			       (!xmlStrcmp(attrs->children->content, (const xmlChar *)"YES")))
-			      {
-				 useRegex = true;
-			      }
-			 }
-		       attrs=attrs->next;
-		    }
-		  addIp(NameNo, (char*)lcur->children->content, useRegex);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"PORT"))
-	       {
-		  setPort(NameNo, (int)atoi((char*)lcur->children->content));
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"PROTOCOL"))
-	       {
-		  if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"HTTP"))
-		    setProtocol(NameNo, PROTOCOL_HTTP);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"HTTPS"))
-		    setProtocol(NameNo, PROTOCOL_HTTPS);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"FTP"))
-		    setProtocol(NameNo, PROTOCOL_FTP);
-		  else if(!xmlStrcmp(lcur->children->content,(const xmlChar *)"CONTROL"))
-		    setProtocol(NameNo, PROTOCOL_CONTROL);
-		  else
-		    { // dynamic protocol
-		       int i = Dynamic.get((const char *)lcur->children->content);
-		       if(i != -1)
-			 setProtocol(NameNo, i + PROTOCOL_DYNAMIC);
-		       else
-			 setProtocol(NameNo, PROTOCOL_HTTP);
-		    }
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"DOCROOT"))
-	       {
-      if(lcur->children &&  lcur->children->content)
-        setDocroot(NameNo, (char*)lcur->children->content);
-      else
-        setDocroot(NameNo, "");
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"SYSFOLDER"))
-	       {
-      if(lcur->children &&  lcur->children->content)
-        setSysfolder(NameNo, (char*)lcur->children->content);
-      else
-        setSysfolder(NameNo, "");
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ACCESSLOG"))
-	       {
-			 if(lcur->children && lcur->children->content)
-				 setAccesseslog(NameNo, (char*)lcur->children->content);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"WARNINGLOG"))
-	       {
-			 if(lcur->children && lcur->children->content)
-   		   setWarninglog(NameNo, (char*)lcur->children->content);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_CGI"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_CGI, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_ISAPI"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_ISAPI, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_MSCGI"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_MSCGI, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_WINCGI"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_WINCGI, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_FASTCGI"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_FASTCGI, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_SCGI"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_SCGI, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_SEND_LINK"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_SEND_LINK, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_EXTERNAL_COMMANDS"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_EXTERNAL_COMMANDS, false);
-	       }
-	     else if(!xmlStrcmp(lcur->name, (const xmlChar *)"ALLOW_SEND_FILE"))
-	       {
-		  if(lcur->children->content)
-		    if(!xmlStrcmp(lcur->children->content, (const xmlChar *)"NO"))
-		      setService(NameNo, ALLOW_SEND_FILE, false);
-	       }
-	     lcur=lcur->next;
-	  }
-     }
-   return 0;
-}
-
-int VHostXML::save(const char * filename)
-{
-   XmlParser xmlFile;
-   int ret = save_core(xmlFile);
-   xmlFile.save((char *)filename);
-   xmlFile.close();
-   return ret;
-}
-
-int VHostXML::saveMemBuf(MemBuf & buffer)
-{
-   XmlParser xmlFile;
-   int ret = save_core(xmlFile);
-   xmlFile.saveMemBuf(buffer);
-   xmlFile.close();
-   return ret;
-}
-
-// from vhosts.cpp with modification
-// Old text way removed to make use of MemBuf
-int VHostXML::save_core(XmlParser & xmlFile)
-{
-   if(VHosts.isempty())
-     return -1;
-
-   // New xml way...
-   int i, i2;
-   
-   xmlFile.newfile("VHOSTS");
-   
-   for(i = 0; i < VHosts.size(); i++)
-     {
-	xmlFile.addGroup("VHOST");
-
-	xmlFile.addChild("NAME", VHosts.at(i)->Text);
-
-	for(i2 = 0; i2 < ((VHostNode *)(VHosts.at(i)->Data))->Ip.size(); i2++)
-	  {
-	     xmlFile.addChild("IP", ((VHostNode *)(VHosts.at(i)->Data))->Ip.at(i2)->Text);
-	     if((bool)((VHostNode *)(VHosts.at(i)->Data))->Ip.at(i2)->Data)
-	       {
-		  xmlFile.setAttr("isRegex", "YES");
-	       }
-	  }
-
-	for(i2 = 0; i2 < ((VHostNode *)(VHosts.at(i)->Data))->Host.size(); i2++)
-	  {
-	     xmlFile.addChild("HOST", ((VHostNode *)(VHosts.at(i)->Data))->Host.at(i2)->Text);
-	     if((bool)((VHostNode *)(VHosts.at(i)->Data))->Host.at(i2)->Data)
-	       {
-		  xmlFile.setAttr("isRegex", "YES");
-	       }
-	  }
-
-	char port[6];
-	snprintf(port,6,"%i",getPort(i));
-	xmlFile.addChild("PORT", port);
-
-	if(getSsl_Privatekey(i) != EMPTY)
-	  {
-	     xmlFile.addChild("SSL_PRIVATEKEY", getSsl_Privatekey(i));
-	  }
-
-	if(getSsl_Certificate(i) != EMPTY)
-	  {
-	     xmlFile.addChild("SSL_CERTIFICATE", getSsl_Certificate(i));
-	  }
-
-	if(getSsl_Password(i) != EMPTY)
-	  {
-	     xmlFile.addChild("SSL_PASSWORD", getSsl_Password(i));
-	  }
-
-	switch(getProtocol(i))
-	  {
-	   case PROTOCOL_HTTP:
-	     xmlFile.addChild("PROTOCOL", "HTTP");
-	     break;
-	   case PROTOCOL_HTTPS:
-	     xmlFile.addChild("PROTOCOL", "HTTPS");
-	     break;
-	   case PROTOCOL_FTP:
-	     xmlFile.addChild("PROTOCOL", "FTP");
-	     break;
-	   case PROTOCOL_CONTROL:
-	     xmlFile.addChild("PROTOCOL", "CONTROL");
-	     break;
-	   default: // Dynamic protocol
-	     xmlFile.addChild("PROTOCOL", Dynamic.at(getProtocol(i) - PROTOCOL_DYNAMIC)->Text);
-	     break;
-	  }
-
-	xmlFile.addChild("DOCROOT", getDocroot(i));
-
-	xmlFile.addChild("SYSFOLDER", getSysfolder(i));
-
-	xmlFile.addChild("ACCESSLOG", getAccesseslog(i));
-
-	xmlFile.addChild("WARNINGLOG", getWarninglog(i));
-
-	if(!getService(i, ALLOW_CGI))
-	  xmlFile.addChild("ALLOW_CGI", "NO");	
-
-	if(!getService(i, ALLOW_ISAPI))
-	  xmlFile.addChild("ALLOW_ISAPI", "NO");
-
-	if(!getService(i, ALLOW_MSCGI))
-	  xmlFile.addChild("ALLOW_MSCGI", "NO");
-
-	if(!getService(i, ALLOW_WINCGI))
-	  xmlFile.addChild("ALLOW_WINCGI", "NO");
-
-	if(!getService(i, ALLOW_FASTCGI))
-	  xmlFile.addChild("ALLOW_FASTCGI", "NO");
-
-	if(!getService(i, ALLOW_SCGI))
-	  xmlFile.addChild("ALLOW_SCGI", "NO");
-
-	if(!getService(i, ALLOW_SEND_LINK))
-	  xmlFile.addChild("ALLOW_SEND_LINK", "NO");
-
-	if(!getService(i, ALLOW_EXTERNAL_COMMANDS))
-	  xmlFile.addChild("ALLOW_EXTERNAL_COMMANDS", "NO");
-
-	if(!getService(i, ALLOW_SEND_FILE))
-	  xmlFile.addChild("ALLOW_SEND_FILE", "NO");
-	
-	xmlFile.endGroup();
-     }
-   return 0;
-}
-
-void VHostXML::populateName(Fl_Choice * o)
-{
-   o->clear();
-   for(int i = 0; i < VHosts.size(); i++)
-     o->add(VHosts.at(i)->Text);
-   if(VHosts.size() == 0)
-     o->add(" ");
-}
-
-void VHostXML::populateHost(int VHostNo, Fl_Browser * o)
-{
-   o->clear();
-   if(VHosts.isempty())
-     return;
-   for(int i = 0; i < ((VHostNode *)(VHosts.at(VHostNo)->Data))->Host.size(); i++)
-     o->add(((VHostNode *)(VHosts.at(VHostNo)->Data))->Host.at(i)->Text);
-}
-
-void VHostXML::populateIp(int VHostNo, Fl_Browser * o)
-{
-   o->clear();
-   if(VHosts.isempty())
-     return;
-   for(int i = 0; i < ((VHostNode *)(VHosts.at(VHostNo)->Data))->Ip.size(); i++)
-     o->add(((VHostNode *)(VHosts.at(VHostNo)->Data))->Ip.at(i)->Text);
-}
-
-int VHostXML::addName(const char * Text)
-{
-   VHostNode * NewNode = new VHostNode;
-   NewNode->Host.clear();
-   NewNode->Ip.clear();
-   NewNode->Port = 0;
-   NewNode->Protocol = 0;
-   NewNode->Service = ALLOW_ALL;
-   NewNode->Ssl_Privatekey = (char *)EMPTY;
-   NewNode->Ssl_Certificate = (char *)EMPTY;
-   NewNode->Ssl_Password = (char *)EMPTY;
-   NewNode->Docroot = (char *)EMPTY;
-   NewNode->Sysfolder = (char *)EMPTY;
-   NewNode->Accesseslog = (char *)EMPTY;
-   NewNode->Warninglog = (char *)EMPTY;
-   VectorNode * ret = VHosts.add(Text, (void *)NewNode);
-   VHosts.sort();
-   return ret->Number;
-}
-
-int VHostXML::addHost(int VHostNo, const char * Text, bool isRegx)
-{
-   if(VHosts.isempty())
-     return 0;
-   VectorNode * ret = ((VHostNode *)(VHosts.at(VHostNo)->Data))->Host.add(Text, (void *)isRegx);
-   ((VHostNode *)(VHosts.at(VHostNo)->Data))->Host.sort();
-   return ret->Number;
-}
-
-int VHostXML::addIp(int VHostNo, const char * Text, bool isRegx)
-{
-   if(VHosts.isempty())
-     return 0;
-   VectorNode * ret = ((VHostNode *)(VHosts.at(VHostNo)->Data))->Ip.add(Text, (void *)isRegx);
-   ((VHostNode *)(VHosts.at(VHostNo)->Data))->Ip.sort();
-   return ret->Number;
-}
-
-void VHostXML::removeName(int VHostNo)
-{
-   if(VHosts.isempty())
-     return;
-   DeleteVHostNode((VHostNode *)(VHosts.at(VHostNo)->Data));
-   VHosts.remove(VHostNo);
-}
-
-void VHostXML::removeHost(int VHostNo, int index)
-{
-   if(VHosts.isempty())
-     return;
-   ((VHostNode *)(VHosts.at(VHostNo)->Data))->Host.remove(index);
-}
-
-void VHostXML::removeIp(int VHostNo, int index)
-{
-   if(VHosts.isempty())
-     return;
-   ((VHostNode *)(VHosts.at(VHostNo)->Data))->Ip.remove(index);
-}
-
-void VHostXML::setPort(int VHostNo, int val)
-{
-   if(VHosts.isempty())
-     return;
-   ((VHostNode *)(VHosts.at(VHostNo)->Data))->Port = val;
-}
-
-void VHostXML::setProtocol(int VHostNo, int val)
-{
-   if(VHosts.isempty())
-     return;
-   ((VHostNode *)(VHosts.at(VHostNo)->Data))->Protocol = val;
-}
-
-void VHostXML::setService(int VHostNo, int serv, bool val)
-{
-   if(VHosts.isempty())
-     return;
-   
-   if(((VHostNode *)(VHosts.at(VHostNo)->Data))->Service & serv)
-     {
-	if(!val)
-	  ((VHostNode *)(VHosts.at(VHostNo)->Data))->Service ^= serv;
-     }
-   else
-     {
-	if(val)
-	  ((VHostNode *)(VHosts.at(VHostNo)->Data))->Service |= serv;
-     }
-}
-
-static inline void setstr(char *& dest, const char * val)
-{
-   if(dest != EMPTY)
-     free(dest);
-   if(val[0] == '\0')
-     dest = (char *)EMPTY;
-   else
-     dest = strdup(val);
-}
-
-void VHostXML::setSsl_Privatekey(int VHostNo, const char * val)
-{
-   if(VHosts.isempty())
-     return;
-   setstr(((VHostNode *)(VHosts.at(VHostNo)->Data))->Ssl_Privatekey, val);
-}
-
-void VHostXML::setSsl_Certificate(int VHostNo, const char * val)
-{
-   if(VHosts.isempty())
-     return;
-   setstr(((VHostNode *)(VHosts.at(VHostNo)->Data))->Ssl_Certificate, val);
-}
-
-void VHostXML::setSsl_Password(int VHostNo, const char * val)
-{
-   if(VHosts.isempty())
-     return;
-   setstr(((VHostNode *)(VHosts.at(VHostNo)->Data))->Ssl_Password, val);
-}
-
-void VHostXML::setDocroot(int VHostNo, const char * val)
-{
-   if(VHosts.isempty())
-     return;
-   setstr(((VHostNode *)(VHosts.at(VHostNo)->Data))->Docroot, val);
-}
-
-void VHostXML::setSysfolder(int VHostNo, const char * val)
-{
-   if(VHosts.isempty())
-     return;
-   setstr(((VHostNode *)(VHosts.at(VHostNo)->Data))->Sysfolder, val);
-}
-
-void VHostXML::setAccesseslog(int VHostNo, const char * val)
-{
-   if(VHosts.isempty())
-     return;
-   setstr(((VHostNode *)(VHosts.at(VHostNo)->Data))->Accesseslog, val);
-}
-
-void VHostXML::setWarninglog(int VHostNo, const char * val)
-{
-   if(VHosts.isempty())
-     return;
-   setstr(((VHostNode *)(VHosts.at(VHostNo)->Data))->Warninglog, val);
-}
-
-int VHostXML::getPort(int VHostNo)
-{
-   if(VHosts.isempty())
-     return 0;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Port;
-}
-
-int VHostXML::getProtocol(int VHostNo)
-{
-   if(VHosts.isempty())
-     return 0;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Protocol;
-}
-
-bool VHostXML::getService(int VHostNo, int serv)
-{
-   if(VHosts.isempty())
-     return 0;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Service & serv;
-}
-   
-const char * VHostXML::getSsl_Privatekey(int VHostNo)
-{
-   if(VHosts.isempty())
-     return EMPTY;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Ssl_Privatekey;
-}
-
-const char * VHostXML::getSsl_Certificate(int VHostNo)
-{
-   if(VHosts.isempty())
-     return EMPTY;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Ssl_Certificate;
-}
-
-const char * VHostXML::getSsl_Password(int VHostNo)
-{
-   if(VHosts.isempty())
-     return EMPTY;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Ssl_Password;
-}
-
-const char * VHostXML::getDocroot(int VHostNo)
-{
-   if(VHosts.isempty())
-     return EMPTY;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Docroot;
-}
-
-const char * VHostXML::getSysfolder(int VHostNo)
-{
-   if(VHosts.isempty())
-     return EMPTY;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Sysfolder;
-}
-
-const char * VHostXML::getAccesseslog(int VHostNo)
-{
-   if(VHosts.isempty())
-     return EMPTY;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Accesseslog;
-}
-
-const char * VHostXML::getWarninglog(int VHostNo)
-{
-   if(VHosts.isempty())
-     return EMPTY;
-   return ((VHostNode *)(VHosts.at(VHostNo)->Data))->Warninglog;
-}
-
-void VHostXML::populateProtocol(Fl_Choice * o)
-{
-   // Fl_Menu_ has a "terminator" item
-   while(o->size() - 1 > PROTOCOL_DYNAMIC)
-     {
-	o->remove(o->size() - 2);
-     }
-   for(int i = 0; i < Dynamic.size(); i++)
-     {
-	o->add(Dynamic.at(i)->Text, 0, 0, 0, 0);
-     }
-}
-
-void VHostXML::loadProtocols(Vector & list)
-{
-   Dynamic.clear();
-   Dynamic.add(list);
-}
-
-static inline void delstr(char * val)
-{
-   if(val != EMPTY)
-     free(val);
-}
-
-void VHostXML::DeleteVHostNode(VHostNode * Node)
-{
-   Node->Host.clear();
-   Node->Ip.clear();
-   delstr(Node->Ssl_Privatekey);
-   delstr(Node->Ssl_Certificate);
-   delstr(Node->Ssl_Password);
-   delstr(Node->Docroot);
-   delstr(Node->Sysfolder);
-   delstr(Node->Accesseslog);
-   delstr(Node->Warninglog);
-   delete Node;
-}
-
diff --git a/misc/control/control/vhost.h b/misc/control/control/vhost.h
deleted file mode 100644
index 1bdea2a..0000000
--- a/misc/control/control/vhost.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  MyServer
- *  Copyright (C) 2002, 2003, 2004 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.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *   */
-#ifndef VHOST_H_CONF
-#define VHOST_H_CONF
-
-#include <FL/Fl.H>
-#include <FL/Fl_Browser.H>
-#include <FL/Fl_Choice.H>
-
-#include "vector.h"
-#include <include/base/mem_buff/mem_buff.h>
-#include <vector>
-
-using namespace std;
-
-enum 
-{
-   PROTOCOL_HTTP = 0,
-   PROTOCOL_HTTPS,
-   PROTOCOL_FTP,
-   PROTOCOL_CONTROL,
-   PROTOCOL_DYNAMIC
-};
-
-#define ALLOW_CGI               0x001
-#define ALLOW_ISAPI             0x002
-#define ALLOW_MSCGI             0x004
-#define ALLOW_WINCGI            0x008
-#define ALLOW_FASTCGI           0x010
-#define ALLOW_SEND_LINK         0x020
-#define ALLOW_EXTERNAL_COMMANDS 0x040
-#define ALLOW_SEND_FILE         0x080
-#define ALLOW_SCGI              0x100
-#define ALLOW_ALL               0xFFF
-
-extern const char * EMPTY;
-
-struct VHostNode
-{
-   Vector Host;
-   Vector Ip;
-   int Port;
-   int Protocol;
-   int Service;
-   char * Ssl_Privatekey;
-   char * Ssl_Certificate;
-   char * Ssl_Password;
-   char * Docroot;
-   char * Sysfolder;
-   char * Accesseslog;
-   char * Warninglog;
-};
-
-class VHostXML
-{
- public:
-   ~VHostXML();
-   void clear();
-   int load(const char *);
-   int loadMemBuf(MemBuf &);
-   int load_core(XmlParser &);
-   int save(const char *);
-   int saveMemBuf(MemBuf &);
-   int save_core(XmlParser &);
-   void populateName(Fl_Choice *);
-   void populateHost(int, Fl_Browser *);
-   void populateIp(int, Fl_Browser *);
-   int addName(const char *);
-   int addHost(int, const char *, bool);
-   int addIp(int, const char *, bool);
-   void removeName(int);
-   void removeHost(int, int);
-   void removeIp(int, int);
-   void setPort(int, int);
-   void setProtocol(int, int);
-   void setService(int, int, bool);
-   void setSsl_Privatekey(int, const char *);
-   void setSsl_Certificate(int, const char *);
-   void setSsl_Password(int, const char *);
-   void setDocroot(int, const char *);
-   void setSysfolder(int, const char *);
-   void setAccesseslog(int, const char *);
-   void setWarninglog(int, const char *);
-   int getPort(int);
-   int getProtocol(int);
-   bool getService(int, int);
-   const char * getSsl_Privatekey(int);
-   const char * getSsl_Certificate(int);
-   const char * getSsl_Password(int);
-   const char * getDocroot(int);
-   const char * getSysfolder(int);
-   const char * getAccesseslog(int);
-   const char * getWarninglog(int);
-   /* Dynamic protocals */
-   void populateProtocol(Fl_Choice *);
-   void loadProtocols(Vector &);
- private :
-   void DeleteVHostNode(VHostNode *);
-   Vector VHosts;
-   Vector Dynamic;
-};
-
-#endif



commit 3565c08bbf7d2787efa45ce5a07a4cf042c6ef3e
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 21:06:33 2009 +0200

    Specifiy the host name in error messages.

diff --git a/myserver/src/conf/vhost/vhost_manager.cpp b/myserver/src/conf/vhost/vhost_manager.cpp
index 58f2ade..2dd9feb 100644
--- a/myserver/src/conf/vhost/vhost_manager.cpp
+++ b/myserver/src/conf/vhost/vhost_manager.cpp
@@ -455,9 +455,8 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
                     lastChar++;
 
                   if (*lastChar == '\\' || *lastChar == '/')
-                    {
-                      *lastChar = '\0';
-                    }
+                    *lastChar = '\0';
+
                   vh->setDocumentRoot ((const char*)lcur->children->content);
                 }
               else
@@ -468,13 +467,13 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
               if (lcur->children && lcur->children->content)
                 {
                   char* lastChar = (char*)lcur->children->content;
+
                   while(*(lastChar+1) != '\0')
                     lastChar++;
 
                   if(*lastChar == '\\' || *lastChar == '/')
-                    {
-                      *lastChar = '\0';
-                    }
+                    *lastChar = '\0';
+
                   vh->setSystemRoot ((const char*)lcur->children->content);
                 }
               else
@@ -488,14 +487,14 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
             {
               loadXMLlogData ("WARNINGLOG", vh, lcur);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"MIME_FILE"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"MIME_FILE"))
             {
-              if(lcur->children)
-                vh->getMIME()->loadXML((char*)lcur->children->content);
+              if (lcur->children)
+                vh->getMIME()->loadXML ((char*)lcur->children->content);
             }
-          else if(!xmlStrcmp(lcur->name, (const xmlChar *)"THROTTLING_RATE"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"THROTTLING_RATE"))
             {
-              vh->setThrottlingRate ((u_long)atoi((char*)lcur->children->content));
+              vh->setThrottlingRate ((u_long)atoi ((char*)lcur->children->content));
             }
 
           lcur = lcur->next;
@@ -510,27 +509,31 @@ int VhostManager::loadXMLConfigurationFile(const char *filename)
           continue;
         }
 
-      if (vh->initializeSSL() < 0)
+      if (vh->initializeSSL () < 0)
         {
-          errMsg.assign ("Error: initializing vhost ");
+          errMsg.assign ("Error: initializing vhost \"");
           errMsg.append (vh->getName ());
-          errMsg.assign (" : cannot initialize SSL. ");
-          Server::getInstance()->logWriteln(errMsg.c_str(), MYSERVER_LOG_MSG_ERROR);
+          errMsg.append ("\"");
+          Server::getInstance ()->logWriteln (errMsg.c_str (),
+                                              MYSERVER_LOG_MSG_ERROR);
           delete vh;
           vh = 0;
           continue;
         }
 
-      if(addVHost(vh))
+      if (addVHost (vh))
         {
-          errMsg.assign("Error: adding vhost");
-          Server::getInstance()->logWriteln(errMsg.c_str(), MYSERVER_LOG_MSG_ERROR);
+          errMsg.assign ("Error: adding vhost \"");
+          errMsg.append (vh->getName ());
+          errMsg.append ("\"");
+          Server::getInstance ()->logWriteln (errMsg.c_str (),
+                                              MYSERVER_LOG_MSG_ERROR);
           delete vh;
           vh = 0;
           continue;
         }
     }
-  parser.close();
+  parser.close ();
 
   changeLocationsOwner ();
 

-----------------------------------------------------------------------

Summary of changes:
 misc/control/control/Makefile.am                   |   14 -
 misc/control/control/MyServer Configure.dev        |  189 -
 misc/control/control/MyServer Configure.ico        |  Bin 2238 -> 0 bytes
 misc/control/control/bless.patch                   |   21 -
 misc/control/control/control_client.cpp            |  600 ---
 misc/control/control/control_client.h              |   81 -
 misc/control/control/fltkconfig.cpp                | 5033 --------------------
 misc/control/control/fltkconfig.fd                 | 2236 ---------
 misc/control/control/fltkconfig.h                  |  439 --
 misc/control/control/language.cpp                  |  410 --
 misc/control/control/language.h                    |   53 -
 misc/control/control/mimetype.cpp                  |  444 --
 misc/control/control/mimetype.h                    |   96 -
 misc/control/control/myserver-configure.cpp        |  400 --
 misc/control/control/progress.cpp                  |   45 -
 misc/control/control/progress.h                    |   27 -
 misc/control/control/service.cpp                   |  178 -
 misc/control/control/service.h                     |   27 -
 misc/control/control/textmangler/textmangler.cpp   |   96 -
 misc/control/control/tmp/keepme                    |    1 -
 misc/control/control/vector.cpp                    |  226 -
 misc/control/control/vector.h                      |   55 -
 misc/control/control/vhost.cpp                     |  665 ---
 misc/control/control/vhost.h                       |  117 -
 myserver/binaries/virtualhosts.default.windows.xml |    4 +-
 myserver/binaries/virtualhosts.default.xml         |    4 +-
 myserver/documentation/ssl_certificates.texi       |    2 +-
 myserver/documentation/virtual_hosts.texi          |    6 +-
 myserver/src/conf/vhost/vhost_manager.cpp          |   43 +-
 29 files changed, 31 insertions(+), 11481 deletions(-)
 delete mode 100644 misc/control/control/Makefile.am
 delete mode 100644 misc/control/control/MyServer Configure.dev
 delete mode 100644 misc/control/control/MyServer Configure.ico
 delete mode 100644 misc/control/control/bless.patch
 delete mode 100644 misc/control/control/control_client.cpp
 delete mode 100644 misc/control/control/control_client.h
 delete mode 100644 misc/control/control/fltkconfig.cpp
 delete mode 100644 misc/control/control/fltkconfig.fd
 delete mode 100644 misc/control/control/fltkconfig.h
 delete mode 100644 misc/control/control/language.cpp
 delete mode 100644 misc/control/control/language.h
 delete mode 100644 misc/control/control/mimetype.cpp
 delete mode 100644 misc/control/control/mimetype.h
 delete mode 100644 misc/control/control/myserver-configure.cpp
 delete mode 100644 misc/control/control/progress.cpp
 delete mode 100644 misc/control/control/progress.h
 delete mode 100644 misc/control/control/service.cpp
 delete mode 100644 misc/control/control/service.h
 delete mode 100644 misc/control/control/textmangler/textmangler.cpp
 delete mode 100644 misc/control/control/tmp/keepme
 delete mode 100644 misc/control/control/vector.cpp
 delete mode 100644 misc/control/control/vector.h
 delete mode 100644 misc/control/control/vhost.cpp
 delete mode 100644 misc/control/control/vhost.h


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 15 17:12:46 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MRBmP-0006Wq-VY
	for mharc-myserver-commit@gnu.org; Wed, 15 Jul 2009 17:12:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MRBmO-0006V9-2d
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 17:12:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MRBmJ-0006Ss-N7
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 17:12:43 -0400
Received: from [199.232.76.173] (port=55930 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MRBmJ-0006Sa-Dw
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 17:12:39 -0400
Received: from savannah.gnu.org ([199.232.41.3]:39757 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 1MRBmH-00065d-Lh
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 17:12:39 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MRBmH-00025s-1a
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 21:12:37 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MRBmE-000235-7A
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 21:12:36 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 592e52de4a224e39a737e6b564954855a658db58
X-Git-Newrev: ef37279196c467a7c8dfb669fc8bc22e6ce7fd38
Message-Id: <E1MRBmE-000235-7A@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 15 Jul 2009 21:12:35 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. ef37279196c467a7c8dfb669fc8bc22e6ce7fd38
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: Wed, 15 Jul 2009 21:12:44 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  ef37279196c467a7c8dfb669fc8bc22e6ce7fd38 (commit)
       via  d0e7b4fab291566dd9f2e2dbf141e70ca96714c1 (commit)
      from  592e52de4a224e39a737e6b564954855a658db58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit ef37279196c467a7c8dfb669fc8bc22e6ce7fd38
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 23:11:53 2009 +0200

    FTP class refactoring, some methods were renamed.

diff --git a/myserver/include/protocol/ftp/ftp.h b/myserver/include/protocol/ftp/ftp.h
index 0958d78..88b21aa 100755
--- a/myserver/include/protocol/ftp/ftp.h
+++ b/myserver/include/protocol/ftp/ftp.h
@@ -32,215 +32,220 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <include/conf/security/security_token.h>
 class Ftp;
 
-class FtpUserData : public ProtocolBuffer
+class FtpuserData:public ProtocolBuffer
 {
 public:
-	FtpUserData();
-	~FtpUserData();
-	void reset();
-	int CloseDataConnection();
-  virtual bool allowDelete(bool);
-
-	enum FtpState
-	{
-		NO_CONTROL_CONNECTION,
-		BUISY,
-		UNAVAILABLE,
-		CONTROL_CONNECTION_UP,
-		USER_LOGGED_IN,
-		DATA_CONNECTION_UP
-	} m_nFtpState;
-
-	std::string m_sUserName, m_sPass;
-	enum FtpRepresentation
-	{
-		REPR_ASCII,
-		REPR_IMAGE
-	} m_nFtpRepresentation;
-	enum FtpFormatControl
-	{
-		NON_PRINT
-	} m_nFtpFormatControl;
-	enum FtpFileStructure
-	{
-		STRU_FILE
-	} m_nFtpFileStructure;
-	enum FtpTransferMode
-	{
-		MODE_STREAM
-	} m_nTransferMode;
-	ConnectionPtr m_pDataConnection;
-	Mutex m_DataConnBusy;
-	FtpHost m_cdh;
-	std::string m_cwd;
-	int m_nLocalDataPort;
-	bool m_bBreakDataConnection;
-	ThreadID m_dataThreadId;
-	bool m_bPassiveSrv;
-	u_long m_nRestartOffset;
-	std::string m_sRenameFrom;
-
-	// STAT data
-	std::string m_sCurrentFileName;
-	u_long m_nFileSize, m_nBytesSent;
+  FtpuserData ();
+  ~FtpuserData ();
+  void reset ();
+  int closeDataConnection ();
+  virtual bool allowdelete (bool);
+
+  enum Ftpstate
+  {
+    NO_CONTROL_CONNECTION,
+    BUISY,
+    UNAVAILABLE,
+    CONTROL_CONNECTION_UP,
+    USER_LOGGED_IN,
+    DATA_CONNECTION_UP
+  } m_nFtpstate;
+
+    std::string m_suserName, m_sPass;
+  enum FtpRepresentation
+  {
+    REPR_ASCII,
+    REPR_IMAGE
+  } m_nFtpRepresentation;
+  enum FtpFormatControl
+  {
+    NON_PRINT
+  } m_nFtpFormatControl;
+  enum FtpFilestructure
+  {
+    STRU_FILE
+  } m_nFtpFilestructure;
+  enum FtpTransfermode
+  {
+    MODE_STREAM
+  } m_nTransfermode;
+  ConnectionPtr m_pDataConnection;
+  Mutex m_DataConnBusy;
+  FtpHost m_cdh;
+    std::string m_cwd;
+  int m_nLocalDataport;
+  bool m_bBreakDataConnection;
+  ThreadID m_dataThreadId;
+  bool m_bPassiveSrv;
+  u_long m_nrestartOffset;
+    std::string m_sRenameFrom;
+
+  // STAT data
+    std::string m_sCurrentFileName;
+  u_long m_nFileSize, m_nBytesSent;
 };
 
 struct FtpThreadContext
 {
-	FtpThreadContext();
-	ConnectionPtr pConnection;
-	MemBuf *buffer;
-	MemBuf *secondaryBuffer;
-	u_long buffersize;
-	u_long secondaryBufferSize;
-	u_long m_nParseLength;
-	u_long nBytesToRead;
-	Ftp *pProtocolInterpreter;
+  FtpThreadContext ();
+  ConnectionPtr pConnection;
+  MemBuf *buffer;
+  MemBuf *secondaryBuffer;
+  u_long buffersize;
+  u_long secondaryBufferSize;
+  u_long m_nParseLength;
+  u_long nBytesToRead;
+  Ftp *pProtocolInterpreter;
   SecurityToken st;
 };
 
-class Ftp : public Protocol
+class Ftp:public Protocol
 {
 public:
-	Ftp();
-	virtual ~Ftp();
-	virtual int controlConnection(ConnectionPtr pConnection, char *b1, char *b2,
-			int bs1, int bs2, u_long nbtr, u_long id);
-	static int loadProtocolStatic(XmlParser*);
-	static int unLoadProtocolStatic(XmlParser*);
-// Ftp helpers
-	int ParseControlConnection();
-	yyscan_t GetScanner() { return m_scanner; }
-	u_long ComputeParseLength(const YYLTYPE &location);
-
-  void logAccess (int nReplyCode, const std::string &sCustomText);
-	void ftp_reply(int nReplyCode, const std::string &sCustomText = "");
-	//int get_ftp_reply(int nReplyCode, std::string &sReply);
-	int PrintError(const char *msg);//TODO: change this fnc !!!
-	FtpThreadContext td;
-	int CloseDataConnection();
-
-	static int FIRST_PASV_PORT;
-	static int LAST_PASV_PORT;
-
-	int CheckRights(const std::string &sUser, const std::string &sPass,  const std::string &sPath, int mask);
-	void WaitDataConnection();
-	
-	int OpenDataConnection();
-	int OpenDataPassive();
-	int OpenDataActive();
-
-  virtual char* registerName(char* out, int len);
-  static char* registerNameImpl(char* out, int len);
-
-protected:
-	yyscan_t	m_scanner;
-	bool UserLoggedIn();
-	bool BuildLocalPath(const std::string &sPath, std::string &sOutPath);
-	bool GetLocalPath(const std::string &sPath, std::string &sOutPath);
-	void RetrStor(bool bRetr, bool bAppend, const std::string &sPath);
-	void RemovePipelinedCmds(MemBuf &In, MemBuf &Out);
+  Ftp ();
+  virtual ~ Ftp ();
+  virtual int controlConnection (ConnectionPtr pConnection, char *b1,
+				 char *b2, int bs1, int bs2, u_long nbtr,
+				 u_long id);
+  static int loadProtocolstatic (XmlParser *);
+  static int unLoadProtocolstatic (XmlParser *);
+
+  int parseControlConnection ();
+  yyscan_t getScanner ()
+  {
+    return m_scanner;
+  }
+  u_long computeParseLength (const YYLTYPE & location);
+
+  void logAccess (int nReplyCode, const std::string & sCustomText);
+  void ftpReply (int nReplyCode, const std::string & sCustomText = "");
+
+  int printError (const char *msg);
+  FtpThreadContext td;
+  int closeDataConnection ();
+
+  static int FIRST_PASV_PORT;
+  static int LAST_PASV_PORT;
+
+  int checkRights (const std::string & suser, const std::string & sPass,
+		   const std::string & sPath, int mask);
+  void waitDataConnection ();
+
+  int OpenDataConnection ();
+  int openDataPassive ();
+  int openDataActive ();
+
+  virtual char *registerName (char *out, int len);
+  static char *registerNameImpl (char *out, int len);
+
+  void escapeTelnet (MemBuf & In, MemBuf & Out);
+  void user (const std::string & sParam);
+  void password (const std::string & sParam);
+  void port (const FtpHost & host);
+  void pasv ();
+  int type (int ntypeCode, int nFormatControlCode = -1);
+  void retr (const std::string & sPath);
+  void quit ();
+  void help (const std::string & sCmd = "");
+  void noop ();
+  void stru (int nstructure);
+  void mode (int nmode);
+  void list (const std::string & sParam = "");
+  void nlst (const std::string & sParam = "");
+  void abor ();
+  void cwd (const std::string & sPath);
+  void pwd ();
+  void rest (const std::string & srestPoint);
+  void syst ();
+  void stat (const std::string & sParam = "");
+  void allo (int nSize, int nRecordSize = -1);
+
+  void stor (const std::string & sPath);
+  void stou (const std::string & sPath);
+  void dele (const std::string & sPath);
+  void appe (const std::string & sPath);
+  void mkd (const std::string & sPath);
+  void rmd (const std::string & sPath);
+  void rnfr (const std::string & sPath);
+  void Rnto (const std::string & sPath);
+
+  /* RFC 3659 commands */
+  void size (const std::string & sPath);
 
-public:
-	void EscapeTelnet(MemBuf &In, MemBuf &Out);
 
-// Ftp commands Handlers
-public:
-	void User(const std::string &sParam);
-	void Password(const std::string &sParam);
-	void Port(const FtpHost &host);
-	void Pasv();
-	int Type(int nTypeCode, int nFormatControlCode = -1);
-	void Retr(const std::string &sPath);
-	void Quit();
-	void Help(const std::string &sCmd = "");
-	void Noop();
-	void Stru(int nStructure);
-	void Mode(int nMode);
-	void List(const std::string &sParam = "");
-	void Nlst(const std::string &sParam = "");
-	void Abor();
-	void Cwd(const std::string &sPath);
-	void Pwd();
-	void Rest(const std::string &sRestPoint);
-	void Syst();
-	void Stat(const std::string &sParam = "");
-	void Allo(int nSize, int nRecordSize = -1);
-
-	void Stor(const std::string &sPath);
-	void Stou(const std::string &sPath);
-	void Dele(const std::string &sPath);
-	void Appe(const std::string &sPath);
-	void Mkd(const std::string &sPath);
-	void Rmd(const std::string &sPath);
-	void Rnfr(const std::string &sPath);
-	void Rnto(const std::string &sPath);
-
-	/* RFC 3659 commands*/
-	void Size(const std::string &sPath);
-
-	static bool m_bAllowAnonymous, m_bAnonymousNeedPass, m_bAllowAsynchronousCmds, m_bEnablePipelining, m_bEnableStoreCmds;
-	int m_nLocalControlPort;
-	int m_nPassivePort;
+protected:
+  yyscan_t m_scanner;
+  bool userLoggedIn ();
+  bool buildLocalPath (const std::string & sPath, std::string & sOutPath);
+  bool getLocalPath (const std::string & sPath, std::string & sOutPath);
+  void retrstor (bool bretr, bool bappend, const std::string & sPath);
+  void removePipelinedCmds (MemBuf & In, MemBuf & Out);
+
+  static bool m_ballowAnonymous, m_bAnonymousNeedPass,
+    m_ballowAsynchronousCmds, m_bEnablePipelining, m_bEnablestoreCmds;
+
+  int m_nLocalControlport;
+  int m_nPassiveport;
 };
 
 class DataConnectionWorkerThreadData
 {
 public:
-	DataConnectionWorkerThreadData();
-	~DataConnectionWorkerThreadData();
-	ConnectionPtr m_pConnection;
-	std::string m_sFilePath;
-	bool m_bAppend;
-	Ftp *m_pFtp;
+  DataConnectionWorkerThreadData ();
+  ~DataConnectionWorkerThreadData ();
+  ConnectionPtr m_pConnection;
+    std::string m_sFilePath;
+  bool m_bappend;
+  Ftp *m_pFtp;
 };
 
-int get_ftp_reply(int nReplyCode, std::string &sReply);
-void ftp_reply(ConnectionPtr pConnection, int nReplyCode, const std::string &sCustomText = "");
-void yyerror(YYLTYPE *pLoc, Ftp *pContext, const char *msg);
+int getFtpReply (int nReplyCode, std::string & sReply);
+void ftpReply (ConnectionPtr pConnection, int nReplyCode,
+		const std::string & sCustomText = "");
+void yyerror (YYLTYPE * pLoc, Ftp * pContext, const char *msg);
 
 
 
 /*!
  *Adapter class to make Ftp reentrant.
  */
-class FtpProtocol : public Protocol
+class FtpProtocol:public Protocol
 {
 public:
-	FtpProtocol()
+  FtpProtocol ()
   {
     protocolOptions = PROTOCOL_FAST_CHECK;
   }
 
-  virtual ~FtpProtocol()
+  virtual ~ FtpProtocol ()
   {
 
   }
 
-  virtual char* registerName(char* out, int len)
+  virtual char *registerName (char *out, int len)
   {
-    return Ftp::registerNameImpl(out, len);
+    return Ftp::registerNameImpl (out, len);
   }
 
-	virtual int controlConnection(ConnectionPtr a, char *b1, char *b2,
-                                int bs1, int bs2, u_long nbtr, u_long id)
+  virtual int controlConnection (ConnectionPtr a, char *b1, char *b2,
+				 int bs1, int bs2, u_long nbtr, u_long id)
   {
     Ftp ftp;
-    return ftp.controlConnection(a, b1, b2, bs1, bs2, nbtr, id);
+    return ftp.controlConnection (a, b1, b2, bs1, bs2, nbtr, id);
   }
 
-  virtual int loadProtocol(XmlParser* parser)
+  virtual int loadProtocol (XmlParser * parser)
   {
-    return Ftp::loadProtocolStatic(parser);
+    return Ftp::loadProtocolstatic (parser);
   }
-  
-	virtual int unLoadProtocol(XmlParser* parser)
+
+  virtual int unLoadProtocol (XmlParser * parser)
   {
-    return Ftp::unLoadProtocolStatic(parser);
+    return Ftp::unLoadProtocolstatic (parser);
 
   }
 
-  int getProtocolOptions()
+  int getProtocolOptions ()
   {
     return protocolOptions;
   }
diff --git a/myserver/include/protocol/ftp/ftp_common.h b/myserver/include/protocol/ftp/ftp_common.h
index 0e0c228..de5a49d 100644
--- a/myserver/include/protocol/ftp/ftp_common.h
+++ b/myserver/include/protocol/ftp/ftp_common.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++ -*- */
 /*
 MyServer
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 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 2 of the License, or
@@ -30,11 +30,11 @@ struct FtpHost
 	int p1, p2;
 };
 
-void SetFtpHost(FtpHost &out, const FtpHost &in);
-void SetFtpHost(FtpHost &out, const char *szIn);
-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);
-void RemovePathsDots(std::string &sPath);
+void setFtpHost(FtpHost &out, const FtpHost &in);
+void setFtpHost(FtpHost &out, const char *szIn);
+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);
+
 #endif //__FTP_COMMON_H__ 
diff --git a/myserver/src/protocol/ftp/ftp.cpp b/myserver/src/protocol/ftp/ftp.cpp
index 20b32e2..34f7d25 100755
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -40,15 +40,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <arpa/inet.h>
 #endif
 
-static DEFINE_THREAD(SendAsciiFile,pParam);
-static DEFINE_THREAD(SendImageFile,pParam);
+static DEFINE_THREAD (SendAsciiFile, pParam);
+static DEFINE_THREAD (SendImageFile, pParam);
 
-static DEFINE_THREAD(ReceiveAsciiFile,pParam);
-static DEFINE_THREAD(ReceiveImageFile,pParam);
+static DEFINE_THREAD (ReceiveAsciiFile, pParam);
+static DEFINE_THREAD (ReceiveImageFile, pParam);
 
 //////////////////////////////////////////////////////////////////////////////
 // FtpHost class
-void SetFtpHost(FtpHost &out, const FtpHost &in)
+void setFtpHost (FtpHost & out, const FtpHost & in)
 {
   out.h1 = in.h1;
   out.h2 = in.h2;
@@ -58,97 +58,98 @@ void SetFtpHost(FtpHost &out, const FtpHost &in)
   out.p2 = in.p2;
 }
 
-void SetFtpHost(FtpHost &out, const char *szIn)
+void setFtpHost (FtpHost & out, const char *szIn)
 {
   std::stringstream ss;
-  char *szLocalIn = strdup(szIn);
-  char *tok = strtok(szLocalIn, ",.");
-  while ( tok != NULL )
-  {
-    ss << tok << " ";
-    tok = strtok(NULL, ",.");
-  }
+  char *szLocalIn = strdup (szIn);
+  char *tok = strtok (szLocalIn, ",.");
+  while (tok != NULL)
+    {
+      ss << tok << " ";
+      tok = strtok (NULL, ",.");
+    }
   ss >> out.h1 >> out.h2 >> out.h3 >> out.h4 >> out.p1 >> out.p2;
-  free(szLocalIn);
+  free (szLocalIn);
 }
 
-void GetIpAddr(const FtpHost &host, char *pOut, const int &nBuffSize)
+void getIpAddr (const FtpHost & host, char *pOut, const int &nBuffSize)
 {
-  if ( pOut == NULL )
+  if (pOut == NULL)
     return;
   std::ostringstream sRet;
   sRet << host.h1 << '.' << host.h2 << '.' << host.h3 << '.' << host.h4;
-  memset(pOut, 0, nBuffSize);
-  strncpy(pOut, sRet.str().c_str(), nBuffSize-1);
+  memset (pOut, 0, nBuffSize);
+  strncpy (pOut, sRet.str ().c_str (), nBuffSize - 1);
 }
 
-int GetPortNo(const FtpHost &host)
+int getPortNo (const FtpHost & host)
 {
   return ((host.p1 << 8) + host.p2);
 }
 
-std::string GetPortNo(unsigned int nPort)
+std::string getPortNo (unsigned int nport)
 {
-  unsigned int hiByte = (nPort & 0x0000ff00) >> 8;
-  unsigned int loByte = nPort & 0x000000ff;
+  unsigned int hiByte = (nport & 0x0000ff00) >> 8;
+  unsigned int loByte = nport & 0x000000ff;
   std::ostringstream out;
   out << hiByte << "," << loByte;
-  return out.str();
+  return out.str ();
 }
 
-std::string GetHost(const FtpHost &host)
+std::string getHost (const FtpHost & host)
 {
   std::ostringstream s;
-  s << host.h1 << ',' << host.h2 << ',' << host.h3 << ',' << host.h4 << ',' << host.p1 << ',' << host.p2;
-  return s.str().c_str();
+  s << host.h1 << ',' << host.h2 << ',' << host.h3 << ',' << host.
+    h4 << ',' << host.p1 << ',' << host.p2;
+  return s.str ().c_str ();
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// FtpUserData class
-FtpUserData::FtpUserData()
+// FtpuserData class
+FtpuserData::FtpuserData ()
 {
-  reset();
-  m_DataConnBusy.init();
+  reset ();
+  m_DataConnBusy.init ();
 }
 
-bool FtpUserData::allowDelete(bool wait)
+bool FtpuserData::allowdelete (bool wait)
 {
-  if ( wait )
-  {
-    //wait for data connection to finish
-    m_DataConnBusy.lock();
-    m_DataConnBusy.unlock();
+  if (wait)
+    {
+      //wait for data connection to finish
+      m_DataConnBusy.lock ();
+      m_DataConnBusy.unlock ();
 
-  }
-  if ( m_pDataConnection != NULL )
-    return !m_pDataConnection->isScheduled();
+    }
+  if (m_pDataConnection != NULL)
+    return !m_pDataConnection->isScheduled ();
   else
-      return true;
+    return true;
 }
 
 
-FtpUserData::~FtpUserData()
+FtpuserData::~FtpuserData ()
 {
   delete m_pDataConnection;
   m_pDataConnection = NULL;
-  m_DataConnBusy.destroy();
+  m_DataConnBusy.destroy ();
 }
 
-void FtpUserData::reset()
+void FtpuserData::reset ()
 {
-  m_nFtpState = NO_CONTROL_CONNECTION;
-  m_pDataConnection = new Connection();
-  m_sUserName = m_sPass = "";
+  m_nFtpstate = NO_CONTROL_CONNECTION;
+  m_pDataConnection = new Connection ();
+  m_suserName = m_sPass = "";
   m_nFtpRepresentation = REPR_ASCII;
   m_nFtpFormatControl = NON_PRINT;
-  m_nFtpFileStructure = STRU_FILE;
-  m_nTransferMode = MODE_STREAM;
+  m_nFtpFilestructure = STRU_FILE;
+  m_nTransfermode = MODE_STREAM;
   m_cwd = "";
-  m_nLocalDataPort = 0;
+  m_nLocalDataport = 0;
   m_bBreakDataConnection = false;
   m_dataThreadId = 0;
   m_bPassiveSrv = false;
-  m_nRestartOffset = 0;
+  m_nrestartOffset = 0;
   m_sCurrentFileName = "";
   m_nFileSize = 0;
   m_nBytesSent = 0;
@@ -160,40 +161,40 @@ void FtpUserData::reset()
   m_cdh.p2 = 0;
 }
 
-int FtpUserData::CloseDataConnection()
+int FtpuserData::closeDataConnection ()
 {
-  if ( m_nFtpState < DATA_CONNECTION_UP )
+  if (m_nFtpstate < DATA_CONNECTION_UP)
     return 1;
 
-  if ( m_pDataConnection != NULL && m_pDataConnection->socket != NULL )
-  {
-    m_pDataConnection->socket->shutdown(SD_BOTH);
-    m_pDataConnection->socket->close();
-    delete m_pDataConnection->socket;
-    m_pDataConnection->socket = NULL;
-    m_pDataConnection->setScheduled(0);
-  }
-  
+  if (m_pDataConnection != NULL && m_pDataConnection->socket != NULL)
+    {
+      m_pDataConnection->socket->shutdown (SD_BOTH);
+      m_pDataConnection->socket->close ();
+      delete m_pDataConnection->socket;
+      m_pDataConnection->socket = NULL;
+      m_pDataConnection->setScheduled (0);
+    }
+
   //m_DataConnBusy.unlock();
-  m_nFtpState = USER_LOGGED_IN;
+  m_nFtpstate = USER_LOGGED_IN;
   return 1;
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// FtpUserData class
-DataConnectionWorkerThreadData::DataConnectionWorkerThreadData()
+// FtpuserData class
+DataConnectionWorkerThreadData::DataConnectionWorkerThreadData ()
 {
   m_pConnection = NULL;
-  m_bAppend = false;
+  m_bappend = false;
 }
 
-DataConnectionWorkerThreadData::~DataConnectionWorkerThreadData()
+DataConnectionWorkerThreadData::~DataConnectionWorkerThreadData ()
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // FtpThreadContext helper structure
-FtpThreadContext::FtpThreadContext()
+FtpThreadContext::FtpThreadContext ()
 {
   pConnection = NULL;
   buffer = NULL;
@@ -209,243 +210,240 @@ FtpThreadContext::FtpThreadContext()
 struct reply
 {
   int nCode;
-  std::string sText;
+    std::string sText;
 };
 
-struct reply reply_table[] = 
-{
-  { 120, "Service ready in %s minutes." },
-  { 125, "Data connection already open; transfer starting." },
-  { 150, "File status okay; about to open data connection." },
-  { 200, "Command okay." },
-  { 213, "File status." },
-  { 214, "The following commands are recognized:\r\n\
+struct reply reply_table[] = {
+  {120, "Service ready in %s minutes."},
+  {125, "Data connection already open; transfer starting."},
+  {150, "File status okay; about to open data connection."},
+  {200, "Command okay."},
+  {213, "File status."},
+  {214, "The following commands are recognized:\r\n\
 USER, PASS, PORT, PASV, TYPE, REST, RETR, LIST, NLST, ABOR, \r\n\
 CWD, CDUP, PWD, ALLO, STOR, STOU, DELE, APPE, MKD, RMD, \r\n\
 RNFR, RNTO, SYST, STAT, QUIT\r\n\
-214 Detailed help on commands will soon be available." },
-  { 215, "%s system type." },
-  { 220, "Service ready for new user." },
-  { 221, "Goodbye." },
-  { 226, "Closing data connection." },
-  { 227, "Entering passive mode. %s" },
-  { 230, "User logged in, proceed."},
-  { 250, "Requested file action okay, completed."},
-  { 257, "PATHNAME created" },
-  { 331, "User name okay, need password." },
-  { 350, "Requested file action pending further information." },
-  { 421, "Service not available, closing control connection." },
-  { 425, "Can't open data connection." },
-  { 426, "Connection closed; Transfer aborted." },
-  { 450, "Requested file action not taken. File unavailable." },
-  { 451, "Requested action aborted: local error in processing." },
-  { 500, "Syntax error, command unrecognized." },
-  { 501, "Syntax error in parameters or arguments." },
-  { 502, "Command not implemented." },
-  { 503, "Bad sequence of commands." },
-  { 504, "Command not implemented for that parameter."},
-  { 530, "Not logged in." },
-  { 532, "Need account for storing files." },
-  { 550, "Requested action not taken. File unavailable." },
-  { 0, "" }
+214 Detailed help on commands will soon be available."},
+  {215, "%s system type."},
+  {220, "Service ready for new user."},
+  {221, "Goodbye."},
+  {226, "Closing data connection."},
+  {227, "Entering passive mode. %s"},
+  {230, "user logged in, proceed."},
+  {250, "Requested file action okay, completed."},
+  {257, "PATHNAME created"},
+  {331, "user name okay, need password."},
+  {350, "Requested file action pending further information."},
+  {421, "Service not available, closing control connection."},
+  {425, "Can't open data connection."},
+  {426, "Connection closed; Transfer aborted."},
+  {450, "Requested file action not taken. File unavailable."},
+  {451, "Requested action aborted: local error in processing."},
+  {500, "Syntax error, command unrecognized."},
+  {501, "Syntax error in parameters or arguments."},
+  {502, "Command not implemented."},
+  {503, "Bad sequence of commands."},
+  {504, "Command not implemented for that parameter."},
+  {530, "Not logged in."},
+  {532, "Need account for storing files."},
+  {550, "Requested action not taken. File unavailable."},
+  {0, ""}
 };
 
-int get_ftp_reply(int nReplyCode, std::string &sReply)
+int getFtpReply (int nReplyCode, std::string & sReply)
 {
-  for ( int i = 0; reply_table[i].nCode != 0; i++ )
-  {
-    if ( reply_table[i].nCode != nReplyCode )
-      continue;
-    sReply = reply_table[i].sText;
-    return 1;
-  }
+  for (int i = 0; reply_table[i].nCode != 0; i++)
+    {
+      if (reply_table[i].nCode != nReplyCode)
+	continue;
+      sReply = reply_table[i].sText;
+      return 1;
+    }
   return 0;
 }
 
-void ftp_reply(ConnectionPtr pConnection, int nReplyCode,
-               const std::string &sCustomText/* = ""*/)
+void ftpReply (ConnectionPtr pConnection, int nReplyCode,
+	   const std::string & sCustomText /* = "" */ )
 {
-  if ( pConnection == NULL || pConnection->socket == NULL )
+  if (pConnection == NULL || pConnection->socket == NULL)
     return;
 
-  std::string sLocalCustomText(sCustomText);
-  Server *pInstance = Server::getInstance();
-  if ( pInstance != NULL && pInstance->stopServer() == 1 )
-  {
-    nReplyCode = 421;
-    sLocalCustomText = "";
-  }
+  std::string sLocalCustomText (sCustomText);
+  Server *pInstance = Server::getInstance ();
+  if (pInstance != NULL && pInstance->stopServer () == 1)
+    {
+      nReplyCode = 421;
+      sLocalCustomText = "";
+    }
 
   std::ostringstream buffer;
-  if ( !sLocalCustomText.empty() )
+  if (!sLocalCustomText.empty ())
     {
-        if ( nReplyCode >= 0 )
+      if (nReplyCode >= 0)
         buffer << nReplyCode << " " << sLocalCustomText << "\r\n";
-        else
-            buffer << sLocalCustomText << "\r\n";
-        }
+      else
+        buffer << sLocalCustomText << "\r\n";
+    }
   else
-  {
-    std::string sReplyText;
-    get_ftp_reply(nReplyCode, sReplyText);
-    if ( sReplyText.find('\n') == std::string::npos )
-      buffer << nReplyCode << " " << sReplyText << "\r\n";
-    else
-      buffer << nReplyCode << "-" << sReplyText << "\r\n";
-  }
+    {
+      std::string sReplyText;
+      getFtpReply (nReplyCode, sReplyText);
+      if (sReplyText.find ('\n') == std::string::npos)
+        buffer << nReplyCode << " " << sReplyText << "\r\n";
+      else
+        buffer << nReplyCode << "-" << sReplyText << "\r\n";
+    }
   pConnection->socket->send (buffer.str ().c_str (),
-                             strlen (buffer.str ().c_str ()), 0);
+			     strlen (buffer.str ().c_str ()), 0);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // Ftp class
 
-bool Ftp::m_bAllowAnonymous = false;
+bool Ftp::m_ballowAnonymous = false;
 bool Ftp::m_bAnonymousNeedPass = true;
-bool Ftp::m_bAllowAsynchronousCmds = true;
+bool Ftp::m_ballowAsynchronousCmds = true;
 bool Ftp::m_bEnablePipelining = true;
-bool Ftp::m_bEnableStoreCmds = true;
+bool Ftp::m_bEnablestoreCmds = true;
 
 int Ftp::FIRST_PASV_PORT = 60000;
 int Ftp::LAST_PASV_PORT = 65000;
 
-Ftp::Ftp()
+Ftp::Ftp ()
 {
-  m_nPassivePort = Ftp::FIRST_PASV_PORT;
+  m_nPassiveport = Ftp::FIRST_PASV_PORT;
   protocolOptions = PROTOCOL_FAST_CHECK | PROTOCOL_DENY_DELETE;
-  protocolPrefix.assign("ftp://");
+  protocolPrefix.assign ("ftp://");
 }
 
-Ftp::~Ftp()
+Ftp::~Ftp ()
 {
 }
 
-int Ftp::controlConnection(ConnectionPtr pConnection, char *b1, char *b2,
-                           int bs1, int bs2, u_long nbtr, u_long id)
+int Ftp::controlConnection (ConnectionPtr pConnection, char *b1, char *b2,
+			int bs1, int bs2, u_long nbtr, u_long id)
 {
-  if ( pConnection == NULL )
+  if (pConnection == NULL)
     return ClientsThread::DELETE_CONNECTION;
-  Server* server = Server::getInstance();
-  if ( server == NULL )
+  Server *server = Server::getInstance ();
+  if (server == NULL)
     return ClientsThread::DELETE_CONNECTION;
 
-  FtpUserData *pFtpUserData = NULL;
-  if ( pConnection->protocolBuffer == NULL )
-    pConnection->protocolBuffer = new FtpUserData();
-  pFtpUserData = static_cast<FtpUserData *>(pConnection->protocolBuffer);
-  if ( pFtpUserData == NULL )
+  FtpuserData *pFtpuserData = NULL;
+  if (pConnection->protocolBuffer == NULL)
+    pConnection->protocolBuffer = new FtpuserData ();
+  pFtpuserData = static_cast < FtpuserData * >(pConnection->protocolBuffer);
+  if (pFtpuserData == NULL)
     return ClientsThread::DELETE_CONNECTION;
 
   // check if ftp is busy(return 120) or unavailable(return 421)
-  if ( pConnection->getToRemove() == CONNECTION_REMOVE_OVERLOAD )
-  {
-    pFtpUserData->m_nFtpState = FtpUserData::BUISY;
-    // TODO: really compute busy time interval
-    std::string sTempText;
-    get_ftp_reply(120, sTempText);
-    std::string::size_type n = sTempText.find("%s");
-    if ( n != std::string::npos )
-      sTempText.replace(n, 2, "10");
-    ftp_reply(120, sTempText);
-  }
+  if (pConnection->getToRemove () == CONNECTION_REMOVE_OVERLOAD)
+    {
+      pFtpuserData->m_nFtpstate = FtpuserData::BUISY;
+      // TODO: really compute busy time interval
+      std::string sTempText;
+      getFtpReply (120, sTempText);
+      std::string::size_type n = sTempText.find ("%s");
+      if (n != std::string::npos)
+        sTempText.replace (n, 2, "10");
+      ftpReply (120, sTempText);
+    }
 
-  if ( server->isRebooting() != 0 )
-  {
-    pFtpUserData->m_nFtpState = FtpUserData::UNAVAILABLE;
-    ftp_reply(421);
-    return 0;
-  }
+  if (server->isRebooting () != 0)
+    {
+      pFtpuserData->m_nFtpstate = FtpuserData::UNAVAILABLE;
+      ftpReply (421);
+      return 0;
+    }
 
   // init default local ports
-  m_nLocalControlPort = pConnection->getLocalPort();
-  pFtpUserData->m_nLocalDataPort = m_nLocalControlPort - 1;
+  m_nLocalControlport = pConnection->getLocalPort ();
+  pFtpuserData->m_nLocalDataport = m_nLocalControlport - 1;
 
-  if ( pFtpUserData->m_cwd.empty() && pConnection->host != NULL )//current dir not initialized
-  {
-    pFtpUserData->m_cwd = "";
-  }
+  if (pFtpuserData->m_cwd.empty () && pConnection->host != NULL)
+    pFtpuserData->m_cwd = "";
 
   //switch context
   td.pConnection = pConnection;
-  td.buffer = pConnection->getActiveThread()->getBuffer();
-  td.secondaryBuffer = pConnection->getActiveThread()->getSecondaryBuffer();
+  td.buffer = pConnection->getActiveThread ()->getBuffer ();
+  td.secondaryBuffer = pConnection->getActiveThread ()->getSecondaryBuffer ();
   td.buffersize = bs1;
   td.secondaryBufferSize = bs2;
   td.nBytesToRead = nbtr;
   td.pProtocolInterpreter = this;
   td.m_nParseLength = 0;
 
-  return ParseControlConnection();
+  return parseControlConnection ();
 }
 
 
-char* Ftp::registerName(char* out, int len)
+char * Ftp::registerName (char *out, int len)
 {
-  return registerNameImpl(out, len);
+  return registerNameImpl (out, len);
 }
 
-char* Ftp::registerNameImpl(char* out, int len)
+char * Ftp::registerNameImpl (char *out, int len)
 {
-  if(out)
-  {
-    myserver_strlcpy(out, "FTP", len);
-  }
-  return (char*) "FTP";
+  if (out)
+    {
+      myserver_strlcpy (out, "FTP", len);
+    }
+  return (char *) "FTP";
 }
 
 
-int Ftp::loadProtocolStatic(XmlParser*)
+int Ftp::loadProtocolstatic (XmlParser *)
 {
   // load custom messages from cfg here
   Server *server = Server::getInstance ();
 
   // allow anonymous access
   const char *pData = server->getHashedData ("ftp.allow_anonymous");
-  if ( pData != NULL )
-    m_bAllowAnonymous = strcmpi("Yes", pData) == 0 ? true : false;
+  if (pData != NULL)
+    m_ballowAnonymous = strcmpi ("Yes", pData) == 0 ? true : false;
 
   // request password for anonymous
   pData = server->getHashedData ("ftp.anonymous_need_pass");
-  if ( pData != NULL )
-    m_bAnonymousNeedPass = strcmpi("Yes", pData) == 0 ? true : false;
+  if (pData != NULL)
+    m_bAnonymousNeedPass = strcmpi ("Yes", pData) == 0 ? true : false;
 
   // enable asyncronous cmds
   pData = server->getHashedData ("ftp.allow_asynchronous_cmds");
-  if ( pData != NULL )
-    m_bAllowAsynchronousCmds = strcmpi("Yes", pData) == 0 ? true : false;
+  if (pData != NULL)
+    m_ballowAsynchronousCmds = strcmpi ("Yes", pData) == 0 ? true : false;
 
   // enable pipelining
   pData = server->getHashedData ("ftp.allow_pipelining");
-  if ( pData != NULL )
-    m_bEnablePipelining = strcmpi("Yes", pData) == 0 ? true : false;
+  if (pData != NULL)
+    m_bEnablePipelining = strcmpi ("Yes", pData) == 0 ? true : false;
 
   // enable write commands
   pData = server->getHashedData ("ftp.allow_store");
-  if ( pData != NULL )
-    m_bEnableStoreCmds = strcmpi("Yes", pData) == 0 ? true : false;
+  if (pData != NULL)
+    m_bEnablestoreCmds = strcmpi ("Yes", pData) == 0 ? true : false;
 
   return 1;
 }
 
-int Ftp::unLoadProtocolStatic(XmlParser*)
+int Ftp::unLoadProtocolstatic (XmlParser *)
 {
-  if ( true/*everything is ok*/ )
+  if (true /*everything is ok */ )
     return 1;
   else
     return 0;
 }
 
-void Ftp::ftp_reply(int nReplyCode, const std::string &sCustomText /*= ""*/)
+void Ftp::ftpReply (int nReplyCode, const std::string & sCustomText /*= ""*/ )
 {
-  if ( td.pConnection == NULL || td.pConnection->socket == NULL )
+  if (td.pConnection == NULL || td.pConnection->socket == NULL)
     return;
 
-  ::ftp_reply(td.pConnection, nReplyCode, sCustomText);
+  ::ftpReply (td.pConnection, nReplyCode, sCustomText);
 
   logAccess (nReplyCode, sCustomText);
 }
 
-void Ftp::logAccess (int nReplyCode, const std::string &sCustomText)
+void Ftp::logAccess (int nReplyCode, const std::string & sCustomText)
 {
   /* Log the reply.  */
   string time;
@@ -455,28 +453,28 @@ void Ftp::logAccess (int nReplyCode, const std::string &sCustomText)
 
   td.secondaryBuffer->setLength (0);
   *td.secondaryBuffer << time
-                      << " " << td.pConnection->getIpAddr ()
-                      << " " << msgCode
-                      << " " << sCustomText;
+    << " " << td.pConnection->getIpAddr ()
+    << " " << msgCode << " " << sCustomText;
 
 #ifdef WIN32
-  *td.secondaryBuffer  << "\r\n" << end_str;
+  *td.secondaryBuffer << "\r\n" << end_str;
 #else
-  *td.secondaryBuffer  << "\n" << end_str;
+  *td.secondaryBuffer << "\n" << end_str;
 #endif
 
   if (td.pConnection->host)
-  td.pConnection->host->accessesLogWrite (td.secondaryBuffer->getBuffer ());
+    td.pConnection->host->accessesLogWrite (td.secondaryBuffer->getBuffer ());
 }
 
-int Ftp::CloseDataConnection()
+int Ftp::closeDataConnection ()
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  int nRet = pFtpUserData->CloseDataConnection();
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  int nRet = pFtpuserData->closeDataConnection ();
   return nRet;
 }
 
-int Ftp::PrintError(const char *msg)
+int Ftp::printError (const char *msg)
 {
   /* Log the reply.  */
   string time;
@@ -484,8 +482,7 @@ int Ftp::PrintError(const char *msg)
 
   td.secondaryBuffer->setLength (0);
   *td.secondaryBuffer << td.pConnection->getIpAddr ();
-  *td.secondaryBuffer << " " << time
-                      << " " << msg;
+  *td.secondaryBuffer << " " << time << " " << msg;
 
   if (td.pConnection->host)
     td.pConnection->host->warningsLogWrite (td.secondaryBuffer->getBuffer ());
@@ -493,82 +490,89 @@ int Ftp::PrintError(const char *msg)
   return 1;
 }
 
-void Ftp::User(const std::string &sParam)
+void
+Ftp::user (const std::string & sParam)
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  if (!m_bAllowAnonymous && strcmpi (pFtpUserData->m_sUserName.c_str (), "anonymous") == 0)
-  {
-    ftp_reply (530);
-    return;
-  }
+  if (!m_ballowAnonymous
+      && strcmpi (pFtpuserData->m_suserName.c_str (), "anonymous") == 0)
+    {
+      ftpReply (530);
+      return;
+    }
 
-  pFtpUserData->m_sUserName = sParam;
-  ftp_reply(331);
+  pFtpuserData->m_suserName = sParam;
+  ftpReply (331);
 }
 
-void Ftp::Password(const std::string &sParam)
+void Ftp::password (const std::string & sParam)
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  if ( !m_bAllowAnonymous && strcmpi(pFtpUserData->m_sUserName.c_str(), "anonymous") == 0 )
-  {
-    ftp_reply(530);
-    return;
-  }
+  if (!m_ballowAnonymous
+      && strcmpi (pFtpuserData->m_suserName.c_str (), "anonymous") == 0)
+    {
+      ftpReply (530);
+      return;
+    }
 
-  pFtpUserData->m_sPass = sParam;
-  pFtpUserData->m_nFtpState = FtpUserData::USER_LOGGED_IN;
-  ftp_reply(230);
+  pFtpuserData->m_sPass = sParam;
+  pFtpuserData->m_nFtpstate = FtpuserData::USER_LOGGED_IN;
+  ftpReply (230);
 }
 
-void Ftp::Port(const FtpHost &host)
+void Ftp::port (const FtpHost & host)
 {
-  WaitDataConnection();
+  waitDataConnection ();
 
-  if ( !UserLoggedIn() )
+  if (!userLoggedIn ())
     return;
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  SetFtpHost(pFtpUserData->m_cdh, host);
-  ftp_reply(200);
+  setFtpHost (pFtpuserData->m_cdh, host);
+  ftpReply (200);
 }
 
-void Ftp::Pasv()
+void Ftp::pasv ()
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  std::string sHost = td.pConnection->getLocalIpAddr();
-  if ( m_nPassivePort < Ftp::LAST_PASV_PORT )
-    sHost += "," + GetPortNo(m_nPassivePort++);
+  std::string sHost = td.pConnection->getLocalIpAddr ();
+  if (m_nPassiveport < Ftp::LAST_PASV_PORT)
+    sHost += "," + getPortNo (m_nPassiveport++);
   else
-  {
-    m_nPassivePort = Ftp::FIRST_PASV_PORT;
-    sHost += "," + GetPortNo(m_nPassivePort++);
-  }
-  SetFtpHost(pFtpUserData->m_cdh, sHost.c_str());
+    {
+      m_nPassiveport = Ftp::FIRST_PASV_PORT;
+      sHost += "," + getPortNo (m_nPassiveport++);
+    }
+  setFtpHost (pFtpuserData->m_cdh, sHost.c_str ());
 
-  pFtpUserData->m_bPassiveSrv = true;
-    if ( OpenDataConnection() == 0 )
-      {
-	ftp_reply(425);//RFC959 command replay exception
-	return;
-      }
+  pFtpuserData->m_bPassiveSrv = true;
+  if (OpenDataConnection () == 0)
+    {
+      ftpReply (425);		//RFC959 command replay exception
+      return;
+    }
 
   std::string sTempText;
-  get_ftp_reply(227, sTempText);
-  std::string::size_type n = sTempText.find("%s");
-  if ( n != std::string::npos )
+  getFtpReply (227, sTempText);
+  std::string::size_type n = sTempText.find ("%s");
+  if (n != std::string::npos)
 #ifdef WIN32
-    sTempText.replace(n, 2, GetHost(pFtpUserData->m_cdh));
+    sTempText.replace (n, 2, getHost (pFtpuserData->m_cdh));
 #else
-    sTempText.replace(n, 2, GetHost(pFtpUserData->m_cdh));
+    sTempText.replace (n, 2, getHost (pFtpuserData->m_cdh));
 #endif //WIN32
-  ftp_reply(227, sTempText);
+  ftpReply (227, sTempText);
 
   //wait for incoming connection
   int timeoutvalue = 3;
@@ -581,849 +585,895 @@ void Ftp::Pasv()
   MYSERVER_SOCKADDRIN asockIn;
   int asockInLen = 0;
   Socket asock;
-  if ( pFtpUserData->m_pDataConnection->socket->dataOnRead(timeoutvalue, 0) == 1 )
+  if (pFtpuserData->m_pDataConnection->socket->dataOnRead (timeoutvalue, 0) ==
+      1)
     {
-    asockInLen = sizeof(sockaddr_in);
-    asock = pFtpUserData->m_pDataConnection->socket->accept(&asockIn, &asockInLen);
-    if ( asock.getHandle() == (Handle)INVALID_SOCKET )
-      return;
+      asockInLen = sizeof (sockaddr_in);
+      asock =
+	pFtpuserData->m_pDataConnection->socket->accept (&asockIn,
+							 &asockInLen);
+      if (asock.getHandle () == (Handle) INVALID_SOCKET)
+	return;
 
-    pFtpUserData->m_pDataConnection->socket->shutdown(SD_BOTH);
-    pFtpUserData->m_pDataConnection->socket->close();
-    delete pFtpUserData->m_pDataConnection->socket;
-    pFtpUserData->m_pDataConnection->socket = new Socket(asock);
-  }
-  pFtpUserData->m_bPassiveSrv = false;
+      pFtpuserData->m_pDataConnection->socket->shutdown (SD_BOTH);
+      pFtpuserData->m_pDataConnection->socket->close ();
+      delete pFtpuserData->m_pDataConnection->socket;
+      pFtpuserData->m_pDataConnection->socket = new Socket (asock);
+    }
+  pFtpuserData->m_bPassiveSrv = false;
 }
 
-void Ftp::RetrStor(bool bRetr, bool bAppend, const std::string &sPath)
-{    
+void Ftp::retrstor (bool bretr, bool bappend, const std::string & sPath)
+{
   std::string sLocalPath;
-  if ( !UserLoggedIn() )
-  {
-    //CloseDataConnection();
-    return;
-  }
-  if ( (bRetr && !GetLocalPath(sPath, sLocalPath)) || 
-    (!bRetr && !BuildLocalPath(sPath, sLocalPath)) )
-  {
-    //CloseDataConnection();
-    return;
-  }
+  if (!userLoggedIn ())
+    {
+      //closeDataConnection();
+      return;
+    }
+  if ((bretr && !getLocalPath (sPath, sLocalPath)) ||
+      (!bretr && !buildLocalPath (sPath, sLocalPath)))
+    {
+      //closeDataConnection();
+      return;
+    }
 
   std::string sLocalDir, sLocalFileName;
-  FilesUtility::splitPath(sLocalPath, sLocalDir, sLocalFileName);
+  FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
 
   /* The security file doesn't exist in any case.  */
   const char *secName = td.st.getHashedData ("security.filename",
-                                             MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
-                                             ".security.xml");
-  if( !strcmpi(sLocalFileName.c_str(), secName))
-  {
-    ftp_reply(550);
-    //CloseDataConnection();
-    return;
-  }
+					     MYSERVER_VHOST_CONF |
+					     MYSERVER_SERVER_CONF,
+					     ".security.xml");
+  if (!strcmpi (sLocalFileName.c_str (), secName))
+    {
+      ftpReply (550);
+      //closeDataConnection();
+      return;
+    }
 
   int nMask = 0;
-  if ( bRetr )
+  if (bretr)
     nMask = MYSERVER_PERMISSION_READ | MYSERVER_PERMISSION_BROWSE;
   else
     nMask = MYSERVER_PERMISSION_WRITE;
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  if (CheckRights (pFtpUserData->m_sUserName, pFtpUserData->m_sPass, sLocalPath, nMask) == 0)
-  {
-    ftp_reply(530);
-    //CloseDataConnection();
-    return;
-  }
+  if (checkRights
+      (pFtpuserData->m_suserName, pFtpuserData->m_sPass, sLocalPath,
+       nMask) == 0)
+    {
+      ftpReply (530);
+      //closeDataConnection();
+      return;
+    }
 
   if (FilesUtility::isDirectory (sLocalPath.c_str ()))
     {
-      ftp_reply (550);
+      ftpReply (550);
       return;
     }
 
   /* FIXME: Log after the file is sent, not before.  */
   logAccess (0, sLocalPath);
 
-  DataConnectionWorkerThreadData *pData = new DataConnectionWorkerThreadData();
+  DataConnectionWorkerThreadData *pData =
+    new DataConnectionWorkerThreadData ();
   pData->m_pConnection = td.pConnection;
-  pData->m_bAppend = bAppend || pFtpUserData->m_nRestartOffset > 0;
+  pData->m_bappend = bappend || pFtpuserData->m_nrestartOffset > 0;
   pData->m_sFilePath = sLocalPath;
   pData->m_pFtp = this;
 
-  pFtpUserData->m_sCurrentFileName = "";
-  pFtpUserData->m_nFileSize = 0;
-  pFtpUserData->m_nBytesSent = 0;
-  
-  switch ( pFtpUserData->m_nFtpRepresentation )
-  {
-    case FtpUserData::REPR_ASCII:
-            Thread::create(&pFtpUserData->m_dataThreadId, bRetr?SendAsciiFile:ReceiveAsciiFile, pData);
+  pFtpuserData->m_sCurrentFileName = "";
+  pFtpuserData->m_nFileSize = 0;
+  pFtpuserData->m_nBytesSent = 0;
+
+  switch (pFtpuserData->m_nFtpRepresentation)
+    {
+    case FtpuserData::REPR_ASCII:
+      Thread::create (&pFtpuserData->m_dataThreadId,
+		      bretr ? SendAsciiFile : ReceiveAsciiFile, pData);
       break;
-    case FtpUserData::REPR_IMAGE:
-            Thread::create(&pFtpUserData->m_dataThreadId, bRetr?SendImageFile:ReceiveImageFile, pData);
+    case FtpuserData::REPR_IMAGE:
+      Thread::create (&pFtpuserData->m_dataThreadId,
+		      bretr ? SendImageFile : ReceiveImageFile, pData);
       break;
-  }
+    }
 }
 
-static DEFINE_THREAD(SendAsciiFile, pParam)
+static
+DEFINE_THREAD (SendAsciiFile, pParam)
 {
-  DataConnectionWorkerThreadData *pWt = reinterpret_cast<DataConnectionWorkerThreadData *>(pParam);
-  if ( pWt == NULL )
-  {
+  DataConnectionWorkerThreadData *pWt =
+    reinterpret_cast < DataConnectionWorkerThreadData * >(pParam);
+  if (pWt == NULL)
+    {
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
   ConnectionPtr pConnection = pWt->m_pConnection;
-  if ( pConnection == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    delete pWt;
+  if (pConnection == NULL)
+    {
+      ftpReply (pConnection, 451);
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(pConnection->protocolBuffer);
-  if ( pFtpUserData == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    delete pWt;
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(pConnection->protocolBuffer);
+  if (pFtpuserData == NULL)
+    {
+      ftpReply (pConnection, 451);
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  pFtpUserData->m_DataConnBusy.lock();
-  
-  if ( pWt->m_pFtp == NULL )
-  {
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+  pFtpuserData->m_DataConnBusy.lock ();
+
+  if (pWt->m_pFtp == NULL)
+    {
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-    ftp_reply(pConnection, 125);
-    else 
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    ftpReply (pConnection, 125);
+  else
     {
-      ftp_reply(pConnection, 150);
-        if ( pWt->m_pFtp->OpenDataConnection() == 0 )
-      {
-        ftp_reply(pConnection, 425);
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+      ftpReply (pConnection, 150);
+      if (pWt->m_pFtp->OpenDataConnection () == 0)
+	{
+	  ftpReply (pConnection, 425);
+	  pFtpuserData->closeDataConnection ();
+	  pFtpuserData->m_DataConnBusy.unlock ();
+	  delete pWt;
 #ifdef WIN32
-  return 0;
+	  return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	  return (void *) 0;
 #endif
-      }
+	}
     }
 
-     if( pFtpUserData->m_pDataConnection == NULL || 
-    pFtpUserData->m_pDataConnection->socket == NULL)
-  {
-    ftp_reply(pConnection, 451);
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+  if (pFtpuserData->m_pDataConnection == NULL ||
+      pFtpuserData->m_pDataConnection->socket == NULL)
+    {
+      ftpReply (pConnection, 451);
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  File *file = NULL;//new File();
+  File *file = NULL;		//new File();
   try
   {
-    file = Server::getInstance()->getCachedFiles()->open(pWt->m_sFilePath.c_str());
-    if ( file == NULL )
-    {
-      ftp_reply(pConnection, 451);
-      pFtpUserData->CloseDataConnection();
-      pFtpUserData->m_DataConnBusy.unlock();
-      delete pWt;
+    file =
+      Server::getInstance ()->getCachedFiles ()->open (pWt->m_sFilePath.
+						       c_str ());
+    if (file == NULL)
+      {
+	ftpReply (pConnection, 451);
+	pFtpuserData->closeDataConnection ();
+	pFtpuserData->m_DataConnBusy.unlock ();
+	delete pWt;
 #ifdef WIN32
-  return 0;
+	return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	return (void *) 0;
 #endif
-    }
-        u_long filesize = file->getFileSize();
-    if ( pFtpUserData->m_nRestartOffset > 0 )
-      pFtpUserData->m_nRestartOffset = 0;// don't implement restart for ASCII
+      }
+    u_long filesize = file->getFileSize ();
+    if (pFtpuserData->m_nrestartOffset > 0)
+      pFtpuserData->m_nrestartOffset = 0;	// don't implement restart for ASCII
 
-    pFtpUserData->m_sCurrentFileName = pWt->m_sFilePath;
-    pFtpUserData->m_nFileSize = filesize;
+    pFtpuserData->m_sCurrentFileName = pWt->m_sFilePath;
+    pFtpuserData->m_nFileSize = filesize;
 
     u_long nbr, nBufferSize = 0;
     char *pLine = NULL;
     int nLineLength = 0;
     std::string sLine;
     MemBuf buffer, secondaryBuffer;
-    buffer.setLength(1024);
-    while ( filesize != 0 )
-    {
-      memset(buffer.getBuffer(), 0, buffer.getRealLength());
-      nBufferSize = std::min(static_cast<u_long>(filesize), static_cast<u_long>(buffer.getRealLength()/2));
-      if ( file->read(buffer.getBuffer(), nBufferSize, &nbr) )
+    buffer.setLength (1024);
+    while (filesize != 0)
       {
-        ftp_reply(pConnection, 451);
-        file->close();
-        delete file;
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	memset (buffer.getBuffer (), 0, buffer.getRealLength ());
+	nBufferSize =
+	  std::min (static_cast < u_long > (filesize),
+		    static_cast < u_long > (buffer.getRealLength () / 2));
+	if (file->read (buffer.getBuffer (), nBufferSize, &nbr))
+	  {
+	    ftpReply (pConnection, 451);
+	    file->close ();
+	    delete file;
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 0;
+	    return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	    return (void *) 0;
 #endif
-      }
-      filesize -= nbr;
-      pFtpUserData->m_nBytesSent += nbr;
+	  }
+	filesize -= nbr;
+	pFtpuserData->m_nBytesSent += nbr;
 
-      secondaryBuffer.setLength(0);
-      pLine = buffer.getBuffer();
-      if ( pLine == NULL )
-      {
-        ftp_reply(pConnection, 451);
-        file->close();
-        delete file;
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	secondaryBuffer.setLength (0);
+	pLine = buffer.getBuffer ();
+	if (pLine == NULL)
+	  {
+	    ftpReply (pConnection, 451);
+	    file->close ();
+	    delete file;
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 0;
+	    return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	    return (void *) 0;
 #endif
-      }
-      while ( *pLine != 0 )
-      {
-        nLineLength = getEndLine(pLine, 0);
-        if ( nLineLength < 0 )//last line
-        {
-          sLine.assign(pLine, strlen(pLine));
-          if ( !sLine.empty() )
-            secondaryBuffer << sLine;
-          pLine += strlen(pLine);
-        }
-        else
-        {
-          sLine.assign(pLine, nLineLength);
-          secondaryBuffer << sLine << "\r\n";
-          if ( *(pLine + nLineLength) == '\r' )
-            nLineLength++;
-          if ( *(pLine + nLineLength) == '\n' )
-            nLineLength++;
-          pLine += nLineLength;
-        }
-      }
-            if ( pFtpUserData->m_pDataConnection->socket->send(secondaryBuffer.getBuffer(), 
-          (u_long)secondaryBuffer.getLength(), 0) == SOCKET_ERROR )
-            {
-        ftp_reply(pConnection, 451);
-               file->close();
-        file->close();
-        delete file;
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	  }
+	while (*pLine != 0)
+	  {
+	    nLineLength = getEndLine (pLine, 0);
+	    if (nLineLength < 0)	//last line
+	      {
+		sLine.assign (pLine, strlen (pLine));
+		if (!sLine.empty ())
+		  secondaryBuffer << sLine;
+		pLine += strlen (pLine);
+	      }
+	    else
+	      {
+		sLine.assign (pLine, nLineLength);
+		secondaryBuffer << sLine << "\r\n";
+		if (*(pLine + nLineLength) == '\r')
+		  nLineLength++;
+		if (*(pLine + nLineLength) == '\n')
+		  nLineLength++;
+		pLine += nLineLength;
+	      }
+	  }
+	if (pFtpuserData->m_pDataConnection->socket->
+	    send (secondaryBuffer.getBuffer (),
+		  (u_long) secondaryBuffer.getLength (), 0) == SOCKET_ERROR)
+	  {
+	    ftpReply (pConnection, 451);
+	    file->close ();
+	    file->close ();
+	    delete file;
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 0;
+	    return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	    return (void *) 0;
 #endif
-            }
-      if ( pFtpUserData->m_bBreakDataConnection )
-      {
-        pFtpUserData->m_bBreakDataConnection = false;
-               file->close();
-        delete file;
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	  }
+	if (pFtpuserData->m_bBreakDataConnection)
+	  {
+	    pFtpuserData->m_bBreakDataConnection = false;
+	    file->close ();
+	    delete file;
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 1;
+	    return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+	    return (void *) 1;
 #endif
+	  }
       }
-    }
-    file->close();
+    file->close ();
     delete file;
   }
-  catch (bad_alloc &ba)
+  catch (bad_alloc & ba)
   {
-    if ( file != NULL )
-      file->close();
+    if (file != NULL)
+      file->close ();
     delete file;
     //report error
   }
 
-  pFtpUserData->m_sCurrentFileName = "";
-  pFtpUserData->m_nFileSize = 0;
-  pFtpUserData->m_nBytesSent = 0;
-  pFtpUserData->m_nRestartOffset = 0;
-  ftp_reply(pConnection, 226);
-  pFtpUserData->CloseDataConnection();
-  pFtpUserData->m_DataConnBusy.unlock();
+  pFtpuserData->m_sCurrentFileName = "";
+  pFtpuserData->m_nFileSize = 0;
+  pFtpuserData->m_nBytesSent = 0;
+  pFtpuserData->m_nrestartOffset = 0;
+  ftpReply (pConnection, 226);
+  pFtpuserData->closeDataConnection ();
+  pFtpuserData->m_DataConnBusy.unlock ();
   delete pWt;
 #ifdef WIN32
   return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+  return (void *) 1;
 #endif
 
 }
 
-static DEFINE_THREAD(SendImageFile, pParam)
+static
+DEFINE_THREAD (SendImageFile, pParam)
 {
-  DataConnectionWorkerThreadData *pWt = reinterpret_cast<DataConnectionWorkerThreadData *>(pParam);
-  if ( pWt == NULL )
-  {
+  DataConnectionWorkerThreadData *pWt =
+    reinterpret_cast < DataConnectionWorkerThreadData * >(pParam);
+  if (pWt == NULL)
+    {
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
   ConnectionPtr pConnection = pWt->m_pConnection;
-  if ( pConnection == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    delete pWt;
+  if (pConnection == NULL)
+    {
+      ftpReply (pConnection, 451);
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(pConnection->protocolBuffer);
-  if ( pFtpUserData == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    pFtpUserData->CloseDataConnection();
-    delete pWt;
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(pConnection->protocolBuffer);
+  if (pFtpuserData == NULL)
+    {
+      ftpReply (pConnection, 451);
+      pFtpuserData->closeDataConnection ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  pFtpUserData->m_DataConnBusy.lock();
-  
-  if ( pWt->m_pFtp == NULL )
-  {
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+  pFtpuserData->m_DataConnBusy.lock ();
+
+  if (pWt->m_pFtp == NULL)
+    {
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
-  
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-    ftp_reply(pConnection, 125);
-    else 
+    }
+
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    ftpReply (pConnection, 125);
+  else
     {
-      ftp_reply(pConnection, 150);
-        if ( pWt->m_pFtp->OpenDataConnection() == 0 )
-      {
-        ftp_reply(pConnection, 425);
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+      ftpReply (pConnection, 150);
+      if (pWt->m_pFtp->OpenDataConnection () == 0)
+	{
+	  ftpReply (pConnection, 425);
+	  pFtpuserData->closeDataConnection ();
+	  pFtpuserData->m_DataConnBusy.unlock ();
+	  delete pWt;
 #ifdef WIN32
-  return 0;
+	  return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	  return (void *) 0;
 #endif
-        }
-  }
+	}
+    }
 
-        if( pFtpUserData->m_pDataConnection == NULL || 
-      pFtpUserData->m_pDataConnection->socket == NULL)
-  {
-    ftp_reply(pConnection, 451);
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+  if (pFtpuserData->m_pDataConnection == NULL ||
+      pFtpuserData->m_pDataConnection->socket == NULL)
+    {
+      ftpReply (pConnection, 451);
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
   File *file = NULL;
   try
   {
-    file = Server::getInstance()->getCachedFiles()->open(pWt->m_sFilePath.c_str());
-    if( file == NULL )
-    {
-      ftp_reply(pConnection, 451);
-      pFtpUserData->CloseDataConnection();
-      pFtpUserData->m_DataConnBusy.unlock();
-      delete pWt;
+    file =
+      Server::getInstance ()->getCachedFiles ()->open (pWt->m_sFilePath.
+						       c_str ());
+    if (file == NULL)
+      {
+	ftpReply (pConnection, 451);
+	pFtpuserData->closeDataConnection ();
+	pFtpuserData->m_DataConnBusy.unlock ();
+	delete pWt;
 #ifdef WIN32
-  return 0;
+	return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	return (void *) 0;
 #endif
-    }
-    u_long filesize = file->getFileSize();
+      }
+    u_long filesize = file->getFileSize ();
     u_long nbr, nBufferSize = 0;
-    if ( pWt->m_bAppend && pFtpUserData->m_nRestartOffset < filesize )
-    {
-      file->seek (pFtpUserData->m_nRestartOffset);
-      filesize -= pFtpUserData->m_nRestartOffset;
-    }
+    if (pWt->m_bappend && pFtpuserData->m_nrestartOffset < filesize)
+      {
+	file->seek (pFtpuserData->m_nrestartOffset);
+	filesize -= pFtpuserData->m_nrestartOffset;
+      }
 
-    pFtpUserData->m_sCurrentFileName = pWt->m_sFilePath;
-    pFtpUserData->m_nFileSize = filesize;
+    pFtpuserData->m_sCurrentFileName = pWt->m_sFilePath;
+    pFtpuserData->m_nFileSize = filesize;
 
     MemBuf secondaryBuffer;
-    secondaryBuffer.setLength(1024);
-    while ( filesize != 0 )
-    {
-      nBufferSize = std::min(static_cast<u_long>(filesize), static_cast<u_long>(secondaryBuffer.getRealLength()/2));
-      if ( file->read(secondaryBuffer.getBuffer(), nBufferSize, &nbr) ||
-        pFtpUserData->m_pDataConnection->socket->send(secondaryBuffer.getBuffer(), 
-          (u_long)nBufferSize, 0) == SOCKET_ERROR )
+    secondaryBuffer.setLength (1024);
+    while (filesize != 0)
       {
-        ftp_reply(pConnection, 451);
-        file->close();
-        delete file;
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	nBufferSize =
+	  std::min (static_cast < u_long > (filesize),
+		    static_cast < u_long >
+		    (secondaryBuffer.getRealLength () / 2));
+	if (file->read (secondaryBuffer.getBuffer (), nBufferSize, &nbr)
+	    || pFtpuserData->m_pDataConnection->socket->send (secondaryBuffer.
+							      getBuffer (),
+							      (u_long)
+							      nBufferSize,
+							      0) ==
+	    SOCKET_ERROR)
+	  {
+	    ftpReply (pConnection, 451);
+	    file->close ();
+	    delete file;
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 0;
+	    return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	    return (void *) 0;
 #endif
-      }
-      filesize -= nbr;
-      pFtpUserData->m_nBytesSent += nbr;
-      pFtpUserData->m_nRestartOffset += nbr;
-      if ( pFtpUserData->m_bBreakDataConnection )
-      {
-        pFtpUserData->m_bBreakDataConnection = false;
-               file->close();
-        delete file;
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	  }
+	filesize -= nbr;
+	pFtpuserData->m_nBytesSent += nbr;
+	pFtpuserData->m_nrestartOffset += nbr;
+	if (pFtpuserData->m_bBreakDataConnection)
+	  {
+	    pFtpuserData->m_bBreakDataConnection = false;
+	    file->close ();
+	    delete file;
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 1;
+	    return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+	    return (void *) 1;
 #endif
+	  }
       }
-    }
-    file->close();
+    file->close ();
     delete file;
   }
-  catch (bad_alloc &ba)
+  catch (bad_alloc & ba)
   {
-    if ( file != NULL )
-      file->close();
+    if (file != NULL)
+      file->close ();
     delete file;
     //report error
   }
 
-  pFtpUserData->m_sCurrentFileName = "";
-  pFtpUserData->m_nFileSize = 0;
-  pFtpUserData->m_nBytesSent = 0;
-  pFtpUserData->m_nRestartOffset = 0;
-  ftp_reply(pConnection, 226);
-  pFtpUserData->CloseDataConnection();
-  pFtpUserData->m_DataConnBusy.unlock();
+  pFtpuserData->m_sCurrentFileName = "";
+  pFtpuserData->m_nFileSize = 0;
+  pFtpuserData->m_nBytesSent = 0;
+  pFtpuserData->m_nrestartOffset = 0;
+  ftpReply (pConnection, 226);
+  pFtpuserData->closeDataConnection ();
+  pFtpuserData->m_DataConnBusy.unlock ();
   delete pWt;
 #ifdef WIN32
   return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+  return (void *) 1;
 #endif
 }
 
-static DEFINE_THREAD(ReceiveAsciiFile, pParam)
+static
+DEFINE_THREAD (ReceiveAsciiFile, pParam)
 {
   DataConnectionWorkerThreadData *pWt =
-    reinterpret_cast<DataConnectionWorkerThreadData *>(pParam);
+    reinterpret_cast < DataConnectionWorkerThreadData * >(pParam);
 
-  if ( pWt == NULL )
-  {
+  if (pWt == NULL)
+    {
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
   ConnectionPtr pConnection = pWt->m_pConnection;
-  if ( pConnection == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    delete pWt;
+  if (pConnection == NULL)
+    {
+      ftpReply (pConnection, 451);
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(pConnection->protocolBuffer);
-  if ( pFtpUserData == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    pFtpUserData->CloseDataConnection();
-    delete pWt;
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(pConnection->protocolBuffer);
+  if (pFtpuserData == NULL)
+    {
+      ftpReply (pConnection, 451);
+      pFtpuserData->closeDataConnection ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  pFtpUserData->m_DataConnBusy.lock();
-  
-  if ( pWt->m_pFtp == NULL )
-  {
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+  pFtpuserData->m_DataConnBusy.lock ();
+
+  if (pWt->m_pFtp == NULL)
+    {
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-    ftp_reply(pConnection, 125);
-    else 
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    ftpReply (pConnection, 125);
+  else
     {
-      ftp_reply(pConnection, 150);
-        if ( pWt->m_pFtp->OpenDataConnection() == 0 )
-      {
-        ftp_reply(pConnection, 425);
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+      ftpReply (pConnection, 150);
+      if (pWt->m_pFtp->OpenDataConnection () == 0)
+	{
+	  ftpReply (pConnection, 425);
+	  pFtpuserData->closeDataConnection ();
+	  pFtpuserData->m_DataConnBusy.unlock ();
+	  delete pWt;
 #ifdef WIN32
-  return 0;
+	  return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	  return (void *) 0;
 #endif
-        }
-  }
-  
-        if( pFtpUserData->m_pDataConnection == NULL || 
-      pFtpUserData->m_pDataConnection->socket == NULL)
-  {
-    ftp_reply(pConnection, 451);
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+	}
+    }
+
+  if (pFtpuserData->m_pDataConnection == NULL ||
+      pFtpuserData->m_pDataConnection->socket == NULL)
+    {
+      ftpReply (pConnection, 451);
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
   File file;
   try
   {
     u_long flags = 0;
-    if ( pWt->m_bAppend )
+    if (pWt->m_bappend)
       flags = File::APPEND | File::WRITE;
     else
       flags = File::FILE_CREATE_ALWAYS | File::WRITE;
-    if ( file.openFile(pWt->m_sFilePath.c_str(), flags) )
-    {
-      ftp_reply(pConnection, 451);
-      pFtpUserData->CloseDataConnection();
-      pFtpUserData->m_DataConnBusy.unlock();
-      delete pWt;
+    if (file.openFile (pWt->m_sFilePath.c_str (), flags))
+      {
+	ftpReply (pConnection, 451);
+	pFtpuserData->closeDataConnection ();
+	pFtpuserData->m_DataConnBusy.unlock ();
+	delete pWt;
 #ifdef WIN32
-  return 0;
+	return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	return (void *) 0;
 #endif
-    }
+      }
 
     MemBuf buffer, secondaryBuffer;
-    buffer.setLength(1024);
-    memset(buffer.getBuffer(), 0, buffer.getRealLength());
+    buffer.setLength (1024);
+    memset (buffer.getBuffer (), 0, buffer.getRealLength ());
     char *pLine = NULL;
     int nLineLength = 0;
     std::string sLine;
     u_long nbr;
-    while ( pFtpUserData->m_pDataConnection->socket->read(buffer.getBuffer(), 
-          (u_long)buffer.getRealLength()-1, &nbr) != SOCKET_ERROR && nbr != 0 )
-    {
-      memset(secondaryBuffer.getBuffer(), 0, secondaryBuffer.getRealLength());
-      secondaryBuffer.setLength(0);
-      pLine = buffer.getBuffer();
-      if ( pLine == NULL )
+    while (pFtpuserData->m_pDataConnection->socket->read (buffer.getBuffer (),
+							  (u_long) buffer.
+							  getRealLength () -
+							  1,
+							  &nbr) !=
+	   SOCKET_ERROR && nbr != 0)
       {
-        ftp_reply(pConnection, 451);
-        file.close();
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	memset (secondaryBuffer.getBuffer (), 0,
+		secondaryBuffer.getRealLength ());
+	secondaryBuffer.setLength (0);
+	pLine = buffer.getBuffer ();
+	if (pLine == NULL)
+	  {
+	    ftpReply (pConnection, 451);
+	    file.close ();
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 0;
+	    return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	    return (void *) 0;
 #endif
-      }
-      while ( *pLine != 0 )
-      {
-        nLineLength = getEndLine(pLine, 0);
-        if ( nLineLength < 0 )//last line
-        {
-          sLine.assign(pLine, strlen(pLine));
-          if ( !sLine.empty() )
-            secondaryBuffer << sLine;
-          pLine += strlen(pLine);
-        }
-        else
-        {
-          sLine.assign(pLine, nLineLength);
+	  }
+	while (*pLine != 0)
+	  {
+	    nLineLength = getEndLine (pLine, 0);
+	    if (nLineLength < 0)	//last line
+	      {
+		sLine.assign (pLine, strlen (pLine));
+		if (!sLine.empty ())
+		  secondaryBuffer << sLine;
+		pLine += strlen (pLine);
+	      }
+	    else
+	      {
+		sLine.assign (pLine, nLineLength);
 #ifdef WIN32
-          secondaryBuffer << sLine << "\r\n";
+		secondaryBuffer << sLine << "\r\n";
 #else
-          secondaryBuffer << sLine << "\n";
+		secondaryBuffer << sLine << "\n";
 #endif
-          if ( *(pLine + nLineLength) == '\r' )
-            nLineLength++;
-          if ( *(pLine + nLineLength) == '\n' )
-            nLineLength++;
-          pLine += nLineLength;
-        }
-      }
-      file.write(secondaryBuffer.getBuffer(), (u_long)secondaryBuffer.getLength(), &nbr);
+		if (*(pLine + nLineLength) == '\r')
+		  nLineLength++;
+		if (*(pLine + nLineLength) == '\n')
+		  nLineLength++;
+		pLine += nLineLength;
+	      }
+	  }
+	file.write (secondaryBuffer.getBuffer (),
+		    (u_long) secondaryBuffer.getLength (), &nbr);
 
-      if ( pFtpUserData->m_bBreakDataConnection )
-      {
-        pFtpUserData->m_bBreakDataConnection = false;
-               file.close();
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	if (pFtpuserData->m_bBreakDataConnection)
+	  {
+	    pFtpuserData->m_bBreakDataConnection = false;
+	    file.close ();
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 1;
+	    return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+	    return (void *) 1;
 #endif
+	  }
+	memset (buffer.getBuffer (), 0, buffer.getRealLength ());
       }
-      memset(buffer.getBuffer(), 0, buffer.getRealLength());
-    }
-    file.close();
+    file.close ();
   }
-  catch (bad_alloc &ba)
+  catch (bad_alloc & ba)
   {
-    file.close();
+    file.close ();
     //report error
   }
 
-  ftp_reply(pConnection, 226);
-  pFtpUserData->CloseDataConnection();
-  pFtpUserData->m_DataConnBusy.unlock();
+  ftpReply (pConnection, 226);
+  pFtpuserData->closeDataConnection ();
+  pFtpuserData->m_DataConnBusy.unlock ();
   delete pWt;
 #ifdef WIN32
   return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+  return (void *) 1;
 #endif
 }
 
-static DEFINE_THREAD(ReceiveImageFile, pParam)
+static
+DEFINE_THREAD (ReceiveImageFile, pParam)
 {
-  DataConnectionWorkerThreadData *pWt = reinterpret_cast<DataConnectionWorkerThreadData *>(pParam);
-  if ( pWt == NULL )
-  {
+  DataConnectionWorkerThreadData *pWt =
+    reinterpret_cast < DataConnectionWorkerThreadData * >(pParam);
+  if (pWt == NULL)
+    {
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)-1;
+      return (void *) -1;
 #endif
-  }
+    }
 
   ConnectionPtr pConnection = pWt->m_pConnection;
-  if ( pConnection == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    delete pWt;
+  if (pConnection == NULL)
+    {
+      ftpReply (pConnection, 451);
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(pConnection->protocolBuffer);
-  if ( pFtpUserData == NULL )
-  {
-    ftp_reply(pConnection, 451);
-    pFtpUserData->CloseDataConnection();
-    delete pWt;
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(pConnection->protocolBuffer);
+  if (pFtpuserData == NULL)
+    {
+      ftpReply (pConnection, 451);
+      pFtpuserData->closeDataConnection ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  pFtpUserData->m_DataConnBusy.lock();
-  
-  if ( pWt->m_pFtp == NULL )
-  {
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+  pFtpuserData->m_DataConnBusy.lock ();
+
+  if (pWt->m_pFtp == NULL)
+    {
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-    ftp_reply(pConnection, 125);
-    else 
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    ftpReply (pConnection, 125);
+  else
     {
-      ftp_reply(pConnection, 150);
-        if ( pWt->m_pFtp->OpenDataConnection() == 0 )
-      {
-        ftp_reply(pConnection, 425);
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+      ftpReply (pConnection, 150);
+      if (pWt->m_pFtp->OpenDataConnection () == 0)
+	{
+	  ftpReply (pConnection, 425);
+	  pFtpuserData->closeDataConnection ();
+	  pFtpuserData->m_DataConnBusy.unlock ();
+	  delete pWt;
 #ifdef WIN32
-  return 0;
+	  return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	  return (void *) 0;
 #endif
-        }
-  }
-  
-        if( pFtpUserData->m_pDataConnection == NULL || 
-      pFtpUserData->m_pDataConnection->socket == NULL)
-  {
-    ftp_reply(pConnection, 451);
-    pFtpUserData->CloseDataConnection();
-    pFtpUserData->m_DataConnBusy.unlock();
-    delete pWt;
+	}
+    }
+
+  if (pFtpuserData->m_pDataConnection == NULL ||
+      pFtpuserData->m_pDataConnection->socket == NULL)
+    {
+      ftpReply (pConnection, 451);
+      pFtpuserData->closeDataConnection ();
+      pFtpuserData->m_DataConnBusy.unlock ();
+      delete pWt;
 #ifdef WIN32
-  return 0;
+      return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+      return (void *) 0;
 #endif
-  }
+    }
 
   File file;
   try
   {
     u_long flags = 0;
-    if ( pWt->m_bAppend )
+    if (pWt->m_bappend)
       flags = File::APPEND | File::WRITE;
     else
       flags = File::FILE_CREATE_ALWAYS | File::WRITE;
-    if ( file.openFile(pWt->m_sFilePath.c_str(), flags) )
-    {
-      ftp_reply(pConnection, 451);
-      pFtpUserData->CloseDataConnection();
-      pFtpUserData->m_DataConnBusy.unlock();
-      delete pWt;
+    if (file.openFile (pWt->m_sFilePath.c_str (), flags))
+      {
+	ftpReply (pConnection, 451);
+	pFtpuserData->closeDataConnection ();
+	pFtpuserData->m_DataConnBusy.unlock ();
+	delete pWt;
 #ifdef WIN32
-  return 0;
+	return 0;
 #elif HAVE_PTHREAD
-  return (void*)0;
+	return (void *) 0;
 #endif
-    }
+      }
     u_long nbr;
     MemBuf buffer;
-    buffer.setLength(1024);
-    memset(buffer.getBuffer(), 0, buffer.getRealLength());
-    while ( pFtpUserData->m_pDataConnection->socket->read(buffer.getBuffer(), 
-          (u_long)buffer.getRealLength()-1, &nbr) != SOCKET_ERROR && nbr != 0 )
-    {
-      file.write(buffer.getBuffer(), nbr, &nbr);
-      if ( pFtpUserData->m_bBreakDataConnection )
+    buffer.setLength (1024);
+    memset (buffer.getBuffer (), 0, buffer.getRealLength ());
+    while (pFtpuserData->m_pDataConnection->socket->read (buffer.getBuffer (),
+							  (u_long) buffer.
+							  getRealLength () -
+							  1,
+							  &nbr) !=
+	   SOCKET_ERROR && nbr != 0)
       {
-        pFtpUserData->m_bBreakDataConnection = false;
-               file.close();
-        pFtpUserData->CloseDataConnection();
-        pFtpUserData->m_DataConnBusy.unlock();
-        delete pWt;
+	file.write (buffer.getBuffer (), nbr, &nbr);
+	if (pFtpuserData->m_bBreakDataConnection)
+	  {
+	    pFtpuserData->m_bBreakDataConnection = false;
+	    file.close ();
+	    pFtpuserData->closeDataConnection ();
+	    pFtpuserData->m_DataConnBusy.unlock ();
+	    delete pWt;
 #ifdef WIN32
-  return 1;
+	    return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+	    return (void *) 1;
 #endif
+	  }
       }
-    }
-    file.close();
+    file.close ();
   }
-  catch (bad_alloc &ba)
+  catch (bad_alloc & ba)
   {
     //report error
-    file.close();
+    file.close ();
   }
 
-  ftp_reply(pConnection, 226);
-  pFtpUserData->CloseDataConnection();
-  pFtpUserData->m_DataConnBusy.unlock();
+  ftpReply (pConnection, 226);
+  pFtpuserData->closeDataConnection ();
+  pFtpuserData->m_DataConnBusy.unlock ();
   delete pWt;
 #ifdef WIN32
   return 1;
 #elif HAVE_PTHREAD
-  return (void*)1;
+  return (void *) 1;
 #endif
 }
 
-bool Ftp::UserLoggedIn()
+bool Ftp::userLoggedIn ()
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  if ( pFtpUserData == NULL )
-  {
-    return false;
-  }
-  if ( pFtpUserData->m_nFtpState < FtpUserData::USER_LOGGED_IN )
-  {
-    ftp_reply(530);
-    return false;
-  }
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  if (pFtpuserData == NULL)
+    {
+      return false;
+    }
+  if (pFtpuserData->m_nFtpstate < FtpuserData::USER_LOGGED_IN)
+    {
+      ftpReply (530);
+      return false;
+    }
   return true;
 }
 
@@ -1433,9 +1483,11 @@ bool Ftp::UserLoggedIn()
  *\param sOutPath local path
  *\return Return true if path exist, file is a normal one and is into the ftp's root folder
  */
-bool Ftp::BuildLocalPath(const std::string &sPathIn, std::string &sOutPath)
+bool
+Ftp::buildLocalPath (const std::string & sPathIn, std::string & sOutPath)
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
   sOutPath = td.pConnection->host->getDocumentRoot ();
 
@@ -1443,24 +1495,26 @@ bool Ftp::BuildLocalPath(const std::string &sPathIn, std::string &sOutPath)
     sOutPath.append ("/");
 
   if (sPathIn[0] != '/')
-    sOutPath.append (pFtpUserData->m_cwd);
+    sOutPath.append (pFtpuserData->m_cwd);
 
-  if ( sPathIn[0] != '-' ) // ls params not handled
+  if (sPathIn[0] != '-')	// ls params not handled
     sOutPath.append (sPathIn);
 
   FilesUtility::completePath (sOutPath);
 
-  std::string sDocRoot(td.pConnection->host->getDocumentRoot());
-  FilesUtility::completePath(sDocRoot);
-  if ( FilesUtility::getPathRecursionLevel(sDocRoot) > FilesUtility::getPathRecursionLevel(sOutPath) )
-  {
-    ftp_reply(550);
-    return false;
-  }
+  std::string sDocRoot (td.pConnection->host->getDocumentRoot ());
+  FilesUtility::completePath (sDocRoot);
+  if (FilesUtility::getPathRecursionLevel (sDocRoot) >
+      FilesUtility::getPathRecursionLevel (sOutPath))
+    {
+      ftpReply (550);
+      return false;
+    }
   ///////////////////////////////////////
-  if ( FilesUtility::isDirectory(sOutPath) &&
-       (sOutPath[sOutPath.length() - 1] != '/' && sOutPath[sOutPath.length() - 1] != '\\') )
-    sOutPath.append("/");
+  if (FilesUtility::isDirectory (sOutPath) &&
+      (sOutPath[sOutPath.length () - 1] != '/'
+       && sOutPath[sOutPath.length () - 1] != '\\'))
+    sOutPath.append ("/");
   return true;
 }
 
@@ -1470,489 +1524,521 @@ bool Ftp::BuildLocalPath(const std::string &sPathIn, std::string &sOutPath)
  *\param sOutPath local path
  *\return Return true if path exist, file is a normal one and is into the ftp's root folder
  */
-bool Ftp::GetLocalPath(const std::string &sPath, std::string &sOutPath)
+bool Ftp::getLocalPath (const std::string & sPath, std::string & sOutPath)
 {
-  if ( !BuildLocalPath(sPath, sOutPath) )
+  if (!buildLocalPath (sPath, sOutPath))
     return false;
 
-  if ( sOutPath.empty() || 
-     !FilesUtility::fileExists(sOutPath) || 
-     FilesUtility::isLink(sOutPath.c_str()) )
-  {
-    ftp_reply(550);
-    return false;
-  }
+  if (sOutPath.empty () ||
+      !FilesUtility::fileExists (sOutPath) ||
+      FilesUtility::isLink (sOutPath.c_str ()))
+    {
+      ftpReply (550);
+      return false;
+    }
 
   return true;
 }
 
-void Ftp::Quit()
+void
+Ftp::quit ()
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
   //wait to finish data transfer
-  if ( !m_bAllowAsynchronousCmds )
-    WaitDataConnection();
+  if (!m_ballowAsynchronousCmds)
+    waitDataConnection ();
 
-  pFtpUserData->m_nFtpState = FtpUserData::NO_CONTROL_CONNECTION;
-  ftp_reply(221);
+  pFtpuserData->m_nFtpstate = FtpuserData::NO_CONTROL_CONNECTION;
+  ftpReply (221);
 }
 
-void Ftp::Help(const std::string &sCmd/* = ""*/)
+void
+Ftp::help (const std::string & sCmd /* = "" */ )
 {
-  WaitDataConnection();
+  waitDataConnection ();
   // treat SITE the same as HELP
-  if ( sCmd.empty() || stringcmpi(sCmd, "SITE") == 0 )
-    ftp_reply(214);
+  if (sCmd.empty () || stringcmpi (sCmd, "SITE") == 0)
+    ftpReply (214);
   else
-    ftp_reply(502);
+    ftpReply (502);
 }
 
-void Ftp::Noop()
+void
+Ftp::noop ()
 {
-  WaitDataConnection();
-  ftp_reply(200);
+  waitDataConnection ();
+  ftpReply (200);
 }
 
-int Ftp::OpenDataConnection()
+int
+Ftp::OpenDataConnection ()
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
     return 1;
 
-  //pFtpUserData->m_DataConnBusy.lock();
-  int nRet = pFtpUserData->m_bPassiveSrv ? OpenDataPassive() : OpenDataActive();
-  if ( nRet != 0 )
-    pFtpUserData->m_nFtpState = FtpUserData::DATA_CONNECTION_UP;
+  //pFtpuserData->m_DataConnBusy.lock();
+  int nRet =
+    pFtpuserData->m_bPassiveSrv ? openDataPassive () : openDataActive ();
+  if (nRet != 0)
+    pFtpuserData->m_nFtpstate = FtpuserData::DATA_CONNECTION_UP;
   return nRet;
 }
 
-int Ftp::OpenDataPassive()
+int
+Ftp::openDataPassive ()
 {
-  Server* server = Server::getInstance();
-  if ( server == NULL )
+  Server *server = Server::getInstance ();
+  if (server == NULL)
     return 0;
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  Socket *pSocket = new Socket();
-  pSocket->socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if ( pSocket->getHandle() == (Handle)INVALID_SOCKET )
+  Socket *pSocket = new Socket ();
+  pSocket->socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (pSocket->getHandle () == (Handle) INVALID_SOCKET)
     return 0;
   int nReuseAddr = 1;
   MYSERVER_SOCKADDR_STORAGE storage = { 0 };
-  ((sockaddr_in*)(&storage))->sin_family = AF_INET;
+  ((sockaddr_in *) (&storage))->sin_family = AF_INET;
   char szIpAddr[16];
-  memset(szIpAddr, 0, 16);
-  GetIpAddr(pFtpUserData->m_cdh, szIpAddr, 16);
+  memset (szIpAddr, 0, 16);
+  getIpAddr (pFtpuserData->m_cdh, szIpAddr, 16);
 #ifdef WIN32
-  ((sockaddr_in*)(&storage))->sin_addr.s_addr = inet_addr(szIpAddr);
+  ((sockaddr_in *) (&storage))->sin_addr.s_addr = inet_addr (szIpAddr);
 #else
-  inet_aton(szIpAddr, &((sockaddr_in*)(&storage))->sin_addr);
+  inet_aton (szIpAddr, &((sockaddr_in *) (&storage))->sin_addr);
 #endif // WIN32
-  ((sockaddr_in*)(&storage))->sin_port = htons(GetPortNo(pFtpUserData->m_cdh));
-  if ( pSocket->setsockopt(SOL_SOCKET, SO_REUSEADDR, (const char*)&nReuseAddr, sizeof(nReuseAddr)) < 0 )
+  ((sockaddr_in *) (&storage))->sin_port =
+    htons (getPortNo (pFtpuserData->m_cdh));
+  if (pSocket->
+      setsockopt (SOL_SOCKET, SO_REUSEADDR, (const char *) &nReuseAddr,
+		  sizeof (nReuseAddr)) < 0)
     return 0;
-  if ( pSocket->bind(&storage, sizeof(sockaddr_in)) != 0 || pSocket->listen(SOMAXCONN) != 0 )
+  if (pSocket->bind (&storage, sizeof (sockaddr_in)) != 0
+      || pSocket->listen (SOMAXCONN) != 0)
     return 0;
 
-  pFtpUserData->m_pDataConnection->setPort(GetPortNo(pFtpUserData->m_cdh));
-  pFtpUserData->m_pDataConnection->setLocalPort(pFtpUserData->m_nLocalDataPort);
-  pFtpUserData->m_pDataConnection->setIpAddr(td.pConnection->getIpAddr());
-  pFtpUserData->m_pDataConnection->setLocalIpAddr(td.pConnection->getLocalIpAddr());
-  pFtpUserData->m_pDataConnection->host = td.pConnection->host;
-  pFtpUserData->m_pDataConnection->socket = pSocket;
-  pFtpUserData->m_pDataConnection->setScheduled(1);
+  pFtpuserData->m_pDataConnection->setPort (getPortNo (pFtpuserData->m_cdh));
+  pFtpuserData->m_pDataConnection->setLocalPort (pFtpuserData->m_nLocalDataport);
+  pFtpuserData->m_pDataConnection->setIpAddr (td.pConnection->getIpAddr ());
+  pFtpuserData->m_pDataConnection->setLocalIpAddr (td.pConnection->getLocalIpAddr ());
+  pFtpuserData->m_pDataConnection->host = td.pConnection->host;
+  pFtpuserData->m_pDataConnection->socket = pSocket;
+  pFtpuserData->m_pDataConnection->setScheduled (1);
   return 1;
 }
 
-int Ftp::OpenDataActive()
+int
+Ftp::openDataActive ()
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
   Socket dataSocket;
-  dataSocket.socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+  dataSocket.socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
   char szIpAddr[16];
-  memset(szIpAddr, 0, 16);
-  GetIpAddr(pFtpUserData->m_cdh, szIpAddr, 16);
-  if ( dataSocket.connect(szIpAddr, GetPortNo(pFtpUserData->m_cdh)) < 0 )
+  memset (szIpAddr, 0, 16);
+  getIpAddr (pFtpuserData->m_cdh, szIpAddr, 16);
+  if (dataSocket.connect (szIpAddr, getPortNo (pFtpuserData->m_cdh)) < 0)
     return 0;
 
-  pFtpUserData->m_pDataConnection->setPort(GetPortNo(pFtpUserData->m_cdh));
-  pFtpUserData->m_pDataConnection->setLocalPort(pFtpUserData->m_nLocalDataPort);
-  pFtpUserData->m_pDataConnection->setIpAddr(td.pConnection->getIpAddr());
-  pFtpUserData->m_pDataConnection->setLocalIpAddr(td.pConnection->getLocalIpAddr());
-  pFtpUserData->m_pDataConnection->host = td.pConnection->host;
-  pFtpUserData->m_pDataConnection->socket = new Socket(dataSocket);
-  pFtpUserData->m_pDataConnection->setScheduled(1);
+  pFtpuserData->m_pDataConnection->setPort (getPortNo (pFtpuserData->m_cdh));
+  pFtpuserData->m_pDataConnection->setLocalPort (pFtpuserData->m_nLocalDataport);
+  pFtpuserData->m_pDataConnection->setIpAddr (td.pConnection->getIpAddr ());
+  pFtpuserData->m_pDataConnection->setLocalIpAddr (td.pConnection->
+                                                   getLocalIpAddr ());
+  pFtpuserData->m_pDataConnection->host = td.pConnection->host;
+  pFtpuserData->m_pDataConnection->socket = new Socket (dataSocket);
+  pFtpuserData->m_pDataConnection->setScheduled (1);
 
   return 1;
 }
 
-int Ftp::Type(int nTypeCode, int nFormatControlCode/* = -1*/)
+int
+Ftp::type (int ntypeCode, int nFormatControlCode /* = -1 */ )
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return 0;
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  pFtpUserData->m_nFtpRepresentation = (FtpUserData::FtpRepresentation)nTypeCode;
-  switch ( nFormatControlCode )
-  {
-    case FtpUserData::NON_PRINT:
-      if ( nTypeCode == FtpUserData::REPR_ASCII )
-        pFtpUserData->m_nFtpFormatControl = (FtpUserData::FtpFormatControl)nFormatControlCode;
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  pFtpuserData->m_nFtpRepresentation =
+    (FtpuserData::FtpRepresentation) ntypeCode;
+  switch (nFormatControlCode)
+    {
+    case FtpuserData::NON_PRINT:
+      if (ntypeCode == FtpuserData::REPR_ASCII)
+	pFtpuserData->m_nFtpFormatControl =
+	  (FtpuserData::FtpFormatControl) nFormatControlCode;
       else
-      {
-        ftp_reply(501);
-        return 0;
-      }
+	{
+	  ftpReply (501);
+	  return 0;
+	}
       break;
-    case FtpUserData::REPR_IMAGE:
-      pFtpUserData->m_nFtpFormatControl = (FtpUserData::FtpFormatControl)nFormatControlCode;
+    case FtpuserData::REPR_IMAGE:
+      pFtpuserData->m_nFtpFormatControl =
+	(FtpuserData::FtpFormatControl) nFormatControlCode;
       break;
-  }
+    }
 
-  ftp_reply(200);
+  ftpReply (200);
   return 1;
 }
 
-void Ftp::Stru(int nStructure)
+void
+Ftp::stru (int nstructure)
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
-  if ( nStructure < 0 )
-    ftp_reply(504);
+  if (nstructure < 0)
+    ftpReply (504);
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  pFtpUserData->m_nFtpFileStructure = (FtpUserData::FtpFileStructure)nStructure;
-  ftp_reply(200);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  pFtpuserData->m_nFtpFilestructure =
+    (FtpuserData::FtpFilestructure) nstructure;
+  ftpReply (200);
 }
 
-void Ftp::Mode(int nMode)
+void
+Ftp::mode (int nmode)
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
-  if ( nMode < 0 )
-    ftp_reply(504);
+  if (nmode < 0)
+    ftpReply (504);
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  pFtpUserData->m_nTransferMode = (FtpUserData::FtpTransferMode)nMode;
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  pFtpuserData->m_nTransfermode = (FtpuserData::FtpTransfermode) nmode;
 }
 
-void Ftp::List(const std::string &sParam/*= ""*/)
+void
+Ftp::list (const std::string & sParam /*= ""*/ )
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  WaitDataConnection();
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  waitDataConnection ();
 
   std::string sLocalPath;
-  if ( !UserLoggedIn() || !GetLocalPath(sParam, sLocalPath) /*|| */ )
+  if (!userLoggedIn () || !getLocalPath (sParam, sLocalPath))
     return;
 
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-    ftp_reply(125);
-    else
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    ftpReply (125);
+  else
     {
-      ftp_reply(150);
-        if ( OpenDataConnection() == 0 )
-	  {
-	    ftp_reply(425);
-	    return;
-	  }
+      ftpReply (150);
+      if (OpenDataConnection () == 0)
+        {
+          ftpReply (425);
+          return;
+        }
     }
 
-  std::string sPath(sLocalPath);
-  if ( sPath.empty() )
-    sPath = pFtpUserData->m_cwd;
+  std::string sPath (sLocalPath);
+  if (sPath.empty ())
+    sPath = pFtpuserData->m_cwd;
 
-  const char *username = pFtpUserData->m_sUserName.c_str();
-  const char *password = pFtpUserData->m_sPass.c_str();
+  const char *username = pFtpuserData->m_suserName.c_str ();
+  const char *password = pFtpuserData->m_sPass.c_str ();
 
-  if (CheckRights (username, password, sLocalPath,
-		   MYSERVER_PERMISSION_BROWSE) == 0)
+  if (checkRights (username, password, sLocalPath,
+                   MYSERVER_PERMISSION_BROWSE) == 0)
     {
-      ftp_reply (530);
+      ftpReply (530);
       return;
     }
 
   time_t now;
-  time(&now);
+  time (&now);
 
-  MemBuf &secondaryBuffer = *td.secondaryBuffer;
-  secondaryBuffer.setLength(0);
+  MemBuf & secondaryBuffer = *td.secondaryBuffer;
+  secondaryBuffer.setLength (0);
 
   char perm[11];
-  if ( FilesUtility::isDirectory(sPath) )
-  {
-    FindData fd;
-    //dir MUST ends with '/'
-    if ( fd.findfirst(sPath) )
-    {
-      ftp_reply(450);
-      CloseDataConnection();
-      return;
-    }
-
-    const char *secName = td.st.getHashedData ("security.filename",
-                                               MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
-                                               ".security.xml");
-    do
+  if (FilesUtility::isDirectory (sPath))
     {
-      if(fd.name[0] == '.' || !strcmpi(fd.name, secName) )
-        continue;
-
-      perm[10] = '\0';
-      perm[0] = fd.attrib == FILE_ATTRIBUTE_DIRECTORY ? 'd' : '-';
-      string completeFileName(sPath);
-      completeFileName.append(fd.name);
-      int guestMask = CheckRights("Guest", "", completeFileName, -1);
-      int pMask = CheckRights(username, password, completeFileName, -1);
-
-      //Owner and group permissions are the same.
-      perm[1] = perm[4] = pMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
-      perm[2] = perm[5] = pMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
-      perm[3] = perm[6] = pMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
-
-      //Permission for All are the permission for Guest
-      perm[7] = guestMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
-      perm[8] = guestMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
-      perm[9] = guestMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
-
-      string date;
-      const char* datePtr =  getRFC822LocalTime(fd.time_write, date, 32);
-
-      char dateFtpFormat[13];
-
-      dateFtpFormat[3] = ' ';
-      dateFtpFormat[6] = ' ';
-      dateFtpFormat[7] = ' ';
-      dateFtpFormat[12] = '\0';
-
-      int offset = datePtr[6] == ' ' ? 0 : 1;
-
-          //Day
-      dateFtpFormat[4] = datePtr[5];
-      dateFtpFormat[5] = datePtr[6];
-
-      //Month
-      dateFtpFormat[0] = datePtr[7 + offset];
-      dateFtpFormat[1] = datePtr[8 + offset];
-      dateFtpFormat[2] = datePtr[9 + offset];
-
-      //If the file was modified in the last 6 months
-      //show the hour instead of the year
-      if(now - fd.time_write < 60 * 60 * 183 && 
-         now > fd.time_write)
-      {
-        //Hour
-        dateFtpFormat[7] = datePtr[16 + offset];
-        dateFtpFormat[8] = datePtr[17 + offset];
-        dateFtpFormat[9] = ':';
-        dateFtpFormat[10] = datePtr[19 + offset];
-        dateFtpFormat[11] = datePtr[20 + offset];
-      }
-      else
-      {
-        //Year
-        dateFtpFormat[8] = datePtr[11 + offset];
-        dateFtpFormat[9] = datePtr[12 + offset];
-        dateFtpFormat[10] = datePtr[13 + offset];
-        dateFtpFormat[11] = datePtr[14 + offset];
-      }
-
-      char nlinkStr[12];
-      memset(nlinkStr, 0, sizeof(char)*12);
+      FindData fd;
+      //dir MUST ends with '/'
+      if (fd.findfirst (sPath))
+	{
+	  ftpReply (450);
+	  closeDataConnection ();
+	  return;
+	}
+
+      const char *secName = td.st.getHashedData ("security.filename",
+						 MYSERVER_VHOST_CONF |
+						 MYSERVER_SERVER_CONF,
+						 ".security.xml");
+      do
+	{
+	  if (fd.name[0] == '.' || !strcmpi (fd.name, secName))
+	    continue;
+
+	  perm[10] = '\0';
+	  perm[0] = fd.attrib == FILE_ATTRIBUTE_DIRECTORY ? 'd' : '-';
+	  string completeFileName (sPath);
+	  completeFileName.append (fd.name);
+	  int guestMask = checkRights ("Guest", "", completeFileName, -1);
+	  int pMask = checkRights (username, password, completeFileName, -1);
+
+	  //Owner and group permissions are the same.
+	  perm[1] = perm[4] = pMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
+	  perm[2] = perm[5] = pMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
+	  perm[3] = perm[6] = pMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
+
+	  //Permission for All are the permission for Guest
+	  perm[7] = guestMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
+	  perm[8] = guestMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
+	  perm[9] = guestMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
+
+	  string date;
+	  const char *datePtr = getRFC822LocalTime (fd.time_write, date, 32);
+
+	  char dateFtpFormat[13];
+
+	  dateFtpFormat[3] = ' ';
+	  dateFtpFormat[6] = ' ';
+	  dateFtpFormat[7] = ' ';
+	  dateFtpFormat[12] = '\0';
+
+	  int offset = datePtr[6] == ' ' ? 0 : 1;
+
+	  //Day
+	  dateFtpFormat[4] = datePtr[5];
+	  dateFtpFormat[5] = datePtr[6];
+
+	  //Month
+	  dateFtpFormat[0] = datePtr[7 + offset];
+	  dateFtpFormat[1] = datePtr[8 + offset];
+	  dateFtpFormat[2] = datePtr[9 + offset];
+
+	  //If the file was modified in the last 6 months
+	  //show the hour instead of the year
+	  if (now - fd.time_write < 60 * 60 * 183 && now > fd.time_write)
+	    {
+	      //Hour
+	      dateFtpFormat[7] = datePtr[16 + offset];
+	      dateFtpFormat[8] = datePtr[17 + offset];
+	      dateFtpFormat[9] = ':';
+	      dateFtpFormat[10] = datePtr[19 + offset];
+	      dateFtpFormat[11] = datePtr[20 + offset];
+	    }
+	  else
+	    {
+	      //Year
+	      dateFtpFormat[8] = datePtr[11 + offset];
+	      dateFtpFormat[9] = datePtr[12 + offset];
+	      dateFtpFormat[10] = datePtr[13 + offset];
+	      dateFtpFormat[11] = datePtr[14 + offset];
+	    }
+
+	  char nlinkStr[12];
+	  memset (nlinkStr, 0, sizeof (char) * 12);
 #ifndef WIN32
-      nlink_t nlink = 1;
-      nlink = fd.getStatStruct()->st_nlink;
-      sprintf(nlinkStr, "%lu", (u_long) nlink);
+	  nlink_t nlink = 1;
+	  nlink = fd.getStatStruct ()->st_nlink;
+	  sprintf (nlinkStr, "%lu", (u_long) nlink);
 #endif
 
-      char fdSizeStr[12];
-      sprintf(fdSizeStr, "%li", fd.size);
+	  char fdSizeStr[12];
+	  sprintf (fdSizeStr, "%li", fd.size);
 
-      secondaryBuffer << (const char *)perm << " " << nlinkStr << " " 
-              << username << " " << username << " " << fdSizeStr 
-              << " " << (const char *)dateFtpFormat << " " 
-              << fd.name << "\r\n";
+	  secondaryBuffer << (const char *) perm << " " << nlinkStr << " "
+	    << username << " " << username << " " << fdSizeStr
+	    << " " << (const char *) dateFtpFormat << " "
+	    << fd.name << "\r\n";
 
-        }
-      while (!fd.findnext());
-    fd.findclose();
-  }
-  else if ( !FilesUtility::isLink(sPath) )
-  {
-    // TODO: implement * selection
-    std::string sDir, sFileName;
-    FilesUtility::splitPath(sLocalPath, sDir, sFileName);
-    FindData fd;
-    if ( fd.findfirst(sDir) )
-    {
-      ftp_reply(450);
-      CloseDataConnection();
-      return;
+	}
+      while (!fd.findnext ());
+      fd.findclose ();
     }
-    do
+  else if (!FilesUtility::isLink (sPath))
     {
-      if ( strcmp(fd.name, sFileName.c_str()) != 0 )
-        continue;
-
-      perm[10] = '\0';
-      perm[0] = fd.attrib == FILE_ATTRIBUTE_DIRECTORY ? 'd' : '-';
-
-      string completeFileName(sDir);
-      completeFileName.append(fd.name);
-
-      int guestMask = CheckRights("guest", "", completeFileName, -1);
-      int pMask = CheckRights(username, password, completeFileName, -1);
-      //Owner and group permissions are the same.
-      perm[1] = perm[4] = pMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
-      perm[2] = perm[5] = pMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
-      perm[3] = perm[6] = pMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
-
-      //Permission for All are the permission for Guest
-      perm[7] = guestMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
-      perm[8] = guestMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
-      perm[9] = guestMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
-
-      string date;
-      const char* datePtr =  getRFC822LocalTime(fd.time_write, date, 32);
-
-      char dateFtpFormat[13];
-
-      dateFtpFormat[3] = ' ';
-      dateFtpFormat[6] = ' ';
-      dateFtpFormat[7] = ' ';
-      dateFtpFormat[12] = '\0';
-
-      int offset = datePtr[6] == ' ' ? 0 : 1;
-
-          //Day
-      dateFtpFormat[4] = datePtr[5];
-      dateFtpFormat[5] = datePtr[6];
-
-      //Month
-      dateFtpFormat[0] = datePtr[7 + offset];
-      dateFtpFormat[1] = datePtr[8 + offset];
-      dateFtpFormat[2] = datePtr[9 + offset];
-
-      //If the file was modified in the last 6 months
-      //show the hour instead of the year
-      if(now - fd.time_write < 60 * 60 * 183 && 
-         now > fd.time_write)
-      {
-        //Hour
-        dateFtpFormat[7] = datePtr[16 + offset];
-        dateFtpFormat[8] = datePtr[17 + offset];
-        dateFtpFormat[9] = ':';
-        dateFtpFormat[10] = datePtr[19 + offset];
-        dateFtpFormat[11] = datePtr[20 + offset];
-      }
-      else
-      {
-        //Year
-        dateFtpFormat[8] = datePtr[11 + offset];
-        dateFtpFormat[9] = datePtr[12 + offset];
-        dateFtpFormat[10] = datePtr[13 + offset];
-        dateFtpFormat[11] = datePtr[14 + offset];
-      }
-
-      char nlinkStr[12];
-      memset(nlinkStr, 0, sizeof(char)*12);
+      // TODO: implement * selection
+      std::string sDir, sFileName;
+      FilesUtility::splitPath (sLocalPath, sDir, sFileName);
+      FindData fd;
+      if (fd.findfirst (sDir))
+	{
+	  ftpReply (450);
+	  closeDataConnection ();
+	  return;
+	}
+      do
+	{
+	  if (strcmp (fd.name, sFileName.c_str ()) != 0)
+	    continue;
+
+	  perm[10] = '\0';
+	  perm[0] = fd.attrib == FILE_ATTRIBUTE_DIRECTORY ? 'd' : '-';
+
+	  string completeFileName (sDir);
+	  completeFileName.append (fd.name);
+
+	  int guestMask = checkRights ("guest", "", completeFileName, -1);
+	  int pMask = checkRights (username, password, completeFileName, -1);
+	  //Owner and group permissions are the same.
+	  perm[1] = perm[4] = pMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
+	  perm[2] = perm[5] = pMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
+	  perm[3] = perm[6] = pMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
+
+	  //Permission for All are the permission for Guest
+	  perm[7] = guestMask & MYSERVER_PERMISSION_READ ? 'r' : '-';
+	  perm[8] = guestMask & MYSERVER_PERMISSION_WRITE ? 'w' : '-';
+	  perm[9] = guestMask & MYSERVER_PERMISSION_EXECUTE ? 'x' : '-';
+
+	  string date;
+	  const char *datePtr = getRFC822LocalTime (fd.time_write, date, 32);
+
+	  char dateFtpFormat[13];
+
+	  dateFtpFormat[3] = ' ';
+	  dateFtpFormat[6] = ' ';
+	  dateFtpFormat[7] = ' ';
+	  dateFtpFormat[12] = '\0';
+
+	  int offset = datePtr[6] == ' ' ? 0 : 1;
+
+	  //Day
+	  dateFtpFormat[4] = datePtr[5];
+	  dateFtpFormat[5] = datePtr[6];
+
+	  //Month
+	  dateFtpFormat[0] = datePtr[7 + offset];
+	  dateFtpFormat[1] = datePtr[8 + offset];
+	  dateFtpFormat[2] = datePtr[9 + offset];
+
+	  //If the file was modified in the last 6 months
+	  //show the hour instead of the year
+	  if (now - fd.time_write < 60 * 60 * 183 && now > fd.time_write)
+	    {
+	      //Hour
+	      dateFtpFormat[7] = datePtr[16 + offset];
+	      dateFtpFormat[8] = datePtr[17 + offset];
+	      dateFtpFormat[9] = ':';
+	      dateFtpFormat[10] = datePtr[19 + offset];
+	      dateFtpFormat[11] = datePtr[20 + offset];
+	    }
+	  else
+	    {
+	      //Year
+	      dateFtpFormat[8] = datePtr[11 + offset];
+	      dateFtpFormat[9] = datePtr[12 + offset];
+	      dateFtpFormat[10] = datePtr[13 + offset];
+	      dateFtpFormat[11] = datePtr[14 + offset];
+	    }
+
+	  char nlinkStr[12];
+	  memset (nlinkStr, 0, sizeof (char) * 12);
 #ifndef WIN32
-      nlink_t nlink = 1;
-      nlink = fd.getStatStruct()->st_nlink;
-      sprintf(nlinkStr, "%lu", (u_long) nlink);
+	  nlink_t nlink = 1;
+	  nlink = fd.getStatStruct ()->st_nlink;
+	  sprintf (nlinkStr, "%lu", (u_long) nlink);
 #endif
 
-      char fdSizeStr[12];
-      sprintf(fdSizeStr, "%li", fd.size);
+	  char fdSizeStr[12];
+	  sprintf (fdSizeStr, "%li", fd.size);
 
-      secondaryBuffer << (const char *)perm << " " << nlinkStr << " " 
-              << username << " " << username << " " << fdSizeStr 
-              << " " << (const char *)dateFtpFormat << " " 
-              << fd.name << "\r\n";
-        }
-      while (!fd.findnext());
-    fd.findclose();
-  }
-  if( pFtpUserData->m_pDataConnection->socket->send(td.secondaryBuffer->getBuffer(), 
-      (u_long)td.secondaryBuffer->getLength(), 0) == SOCKET_ERROR)
-  {
-    ftp_reply(451);
-  }
+	  secondaryBuffer << (const char *) perm << " " << nlinkStr << " "
+	    << username << " " << username << " " << fdSizeStr
+	    << " " << (const char *) dateFtpFormat << " "
+	    << fd.name << "\r\n";
+	}
+      while (!fd.findnext ());
+      fd.findclose ();
+    }
+  if (pFtpuserData->m_pDataConnection->socket->
+      send (td.secondaryBuffer->getBuffer (),
+	    (u_long) td.secondaryBuffer->getLength (), 0) == SOCKET_ERROR)
+    {
+      ftpReply (451);
+    }
 
-  ftp_reply(226);
-  CloseDataConnection();
+  ftpReply (226);
+  closeDataConnection ();
 }
 
-void Ftp::Nlst(const std::string &sParam/* = ""*/)
+void
+Ftp::nlst (const std::string & sParam /* = "" */ )
 {
-  WaitDataConnection();
+  waitDataConnection ();
   std::string sLocalPath;
-  if ( !UserLoggedIn() || !GetLocalPath(sParam, sLocalPath) )
+  if (!userLoggedIn () || !getLocalPath (sParam, sLocalPath))
     return;
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-    ftp_reply(125);
-    else
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    ftpReply (125);
+  else
     {
-      ftp_reply(150);
-        if ( OpenDataConnection() == 0 )
-	  {
-	    ftp_reply(425);
-	    return;
-	  }
+      ftpReply (150);
+      if (OpenDataConnection () == 0)
+	{
+	  ftpReply (425);
+	  return;
+	}
     }
 
-  std::string sPath(sLocalPath);
-  if ( sPath.empty() )
-    sPath = pFtpUserData->m_cwd;
+  std::string sPath (sLocalPath);
+  if (sPath.empty ())
+    sPath = pFtpuserData->m_cwd;
 
-  if ( !FilesUtility::isDirectory(sPath) )
-  {
-    ftp_reply(450);
-    CloseDataConnection();
-    return;
-  }
+  if (!FilesUtility::isDirectory (sPath))
+    {
+      ftpReply (450);
+      closeDataConnection ();
+      return;
+    }
   FindData fd;
-  if ( fd.findfirst(sPath) )
-  {
-    ftp_reply(450);
-    CloseDataConnection();
-    return;
-  }
+  if (fd.findfirst (sPath))
+    {
+      ftpReply (450);
+      closeDataConnection ();
+      return;
+    }
 
-  MemBuf &secondaryBuffer = *td.secondaryBuffer;
-  secondaryBuffer.setLength(0);
+  MemBuf & secondaryBuffer = *td.secondaryBuffer;
+  secondaryBuffer.setLength (0);
 
   const char *secName = td.st.getHashedData ("security.filename",
-                                             MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
-                                             ".security.xml");
+					     MYSERVER_VHOST_CONF |
+					     MYSERVER_SERVER_CONF,
+					     ".security.xml");
   do
     {
-      if(fd.name[0] == '.' || !strcmpi(fd.name, secName) )
-        continue;
+      if (fd.name[0] == '.' || !strcmpi (fd.name, secName))
+	continue;
 
-      if ( !sParam.empty() )
-        secondaryBuffer << sParam << "/";
+      if (!sParam.empty ())
+	secondaryBuffer << sParam << "/";
       secondaryBuffer << fd.name << "\r\n";
     }
-  while (!fd.findnext());
+  while (!fd.findnext ());
 
-  fd.findclose();
+  fd.findclose ();
 
-  if( pFtpUserData->m_pDataConnection->socket->send(td.secondaryBuffer->getBuffer(), 
-      (u_long)td.secondaryBuffer->getLength(), 0) == SOCKET_ERROR)
-  {
-    ftp_reply(451);
-  }
-  ftp_reply(226);
-  CloseDataConnection();
+  if (pFtpuserData->m_pDataConnection->socket->
+      send (td.secondaryBuffer->getBuffer (),
+	    (u_long) td.secondaryBuffer->getLength (), 0) == SOCKET_ERROR)
+    {
+      ftpReply (451);
+    }
+  ftpReply (226);
+  closeDataConnection ();
 }
 
 /*!
@@ -1966,49 +2052,50 @@ void Ftp::Nlst(const std::string &sParam/* = ""*/)
  *\param In client's requests
  *\param Out client's requests without telnet codes
  */
-void Ftp::EscapeTelnet(MemBuf &In, MemBuf &Out)
+void
+Ftp::escapeTelnet (MemBuf & In, MemBuf & Out)
 {
-  Out.setLength(0);
+  Out.setLength (0);
 
-  if ( In.getRealLength() == 0 )
+  if (In.getRealLength () == 0)
     return;
 
-  char *pIn = In.getBuffer();
+  char *pIn = In.getBuffer ();
   char szReply[3];
 
-  while ( (u_int) (pIn - In.getBuffer()) < In.getLength() )
+  while ((u_int) (pIn - In.getBuffer ()) < In.getLength ())
     {
-        if ( *pIn == '\377' )
-        {
-            szReply[0] = *pIn++;
-            if ( *pIn == '\0' )
-                break;
-            switch ( *pIn )
-            {
-                case '\375'://DO
-                case '\376'://DONT
-                    szReply[1] = '\374';
-                    pIn++;
-                    break;
-                case '\373'://WILL
-                case '\374'://WONT
-                    szReply[1] = '\376';
-                    pIn++;
-                    break;
-                case '\377':
-                    szReply[1] = '\0';
-                Out << *pIn;
-                    break;
-
-                default:
-                    pIn++;
-                    continue;
-            }
-            szReply[2] = *pIn++;
-            ftp_reply(-1, szReply);
-            continue;
-        }
-    Out << *pIn++;
+      if (*pIn == '\377')
+	{
+	  szReply[0] = *pIn++;
+	  if (*pIn == '\0')
+	    break;
+	  switch (*pIn)
+	    {
+	    case '\375':	//DO
+	    case '\376':	//DONT
+	      szReply[1] = '\374';
+	      pIn++;
+	      break;
+	    case '\373':	//WILL
+	    case '\374':	//WONT
+	      szReply[1] = '\376';
+	      pIn++;
+	      break;
+	    case '\377':
+	      szReply[1] = '\0';
+	      Out << *pIn;
+	      break;
+
+	    default:
+	      pIn++;
+	      continue;
+	    }
+	  szReply[2] = *pIn++;
+	  ftpReply (-1, szReply);
+	  continue;
+	}
+      Out << *pIn++;
     }
   Out << '\0';
 }
@@ -2018,479 +2105,505 @@ void Ftp::EscapeTelnet(MemBuf &In, MemBuf &Out)
  *\param In client's requests
  *\param Out client's requests without telnet codes
  */
-void Ftp::RemovePipelinedCmds(MemBuf &In, MemBuf &Out)
+void Ftp::removePipelinedCmds (MemBuf & In, MemBuf & Out)
 {
-  Out.setLength(0);
-  if ( In.getRealLength() == 0 )
+  Out.setLength (0);
+  if (In.getRealLength () == 0)
     return;
   int i = 0;
-  for ( char c = In[i]; c != '\0'; i++, c = In[i] )
-  {
-    Out << c;
-    if ( c == '\n' )
-      break;
-  }
+  for (char c = In[i]; c != '\0'; i++, c = In[i])
+    {
+      Out << c;
+      if (c == '\n')
+	break;
+    }
   Out << '\0';
 }
 
-void Ftp::Abor()
+void Ftp::abor ()
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
   //wait to finish data transfer
-  if ( !m_bAllowAsynchronousCmds )
-    WaitDataConnection();
+  if (!m_ballowAsynchronousCmds)
+    waitDataConnection ();
 
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-  {
-    pFtpUserData->m_bBreakDataConnection = true;
-          Thread::join(pFtpUserData->m_dataThreadId);// wait for data connection to end
-    ftp_reply(426);
-  }
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    {
+      pFtpuserData->m_bBreakDataConnection = true;
+      Thread::join (pFtpuserData->m_dataThreadId);	// wait for data connection to end
+      ftpReply (426);
+    }
   else
-    ftp_reply(226);
-  pFtpUserData->m_bBreakDataConnection = false;
+    ftpReply (226);
+  pFtpuserData->m_bBreakDataConnection = false;
 }
 
-void Ftp::Pwd()
+void Ftp::pwd ()
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
   std::string sCurrentPath = "\"";
-  sCurrentPath += pFtpUserData->m_cwd + "\"";
-  ftp_reply(257, sCurrentPath);
+  sCurrentPath += pFtpuserData->m_cwd + "\"";
+  ftpReply (257, sCurrentPath);
 }
 
-void Ftp::Cwd(const std::string &sPath)
+void Ftp::cwd (const std::string & sPath)
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
 
   std::string sLocalPath;
-  if ( !GetLocalPath(sPath, sLocalPath) )
+  if (!getLocalPath (sPath, sLocalPath))
     return;
-  if ( !FilesUtility::isDirectory(sLocalPath) )
+  if (!FilesUtility::isDirectory (sLocalPath))
     {
-      ftp_reply(550);
+      ftpReply (550);
       return;
     }
 
   if (sPath[0] == '/')
-    pFtpUserData->m_cwd.assign ("");
+    pFtpuserData->m_cwd.assign ("");
 
   if (sPath.size () == 2 && sPath[0] == '.' && sPath[1] == '.')
     {
-      size_t ind = pFtpUserData->m_cwd.find_last_of ('/');
+      size_t ind = pFtpuserData->m_cwd.find_last_of ('/');
       if (ind != string::npos)
-        pFtpUserData->m_cwd.erase (ind + 1);
+	pFtpuserData->m_cwd.erase (ind + 1);
     }
   else if (sPath.size () != 1 || sPath[0] != '.')
     {
-      if (pFtpUserData->m_cwd.size () &&
-          pFtpUserData->m_cwd[pFtpUserData->m_cwd.size () - 1] != '/')
-        pFtpUserData->m_cwd += "/";
-      pFtpUserData->m_cwd += sPath;
+      if (pFtpuserData->m_cwd.size () &&
+	  pFtpuserData->m_cwd[pFtpuserData->m_cwd.size () - 1] != '/')
+	pFtpuserData->m_cwd += "/";
+      pFtpuserData->m_cwd += sPath;
     }
 
-  ftp_reply(250);
+  ftpReply (250);
 }
 
-void Ftp::Rest(const std::string &sRestPoint)
+void Ftp::rest (const std::string & srestPoint)
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  pFtpUserData->m_nRestartOffset = strtoul(sRestPoint.c_str(), NULL, 10);
-  ftp_reply(350);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  pFtpuserData->m_nrestartOffset = strtoul (srestPoint.c_str (), NULL, 10);
+  ftpReply (350);
 }
 
-void Ftp::Syst()
+void Ftp::syst ()
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
 
   std::string sTempText;
-  get_ftp_reply(215, sTempText);
-  std::string::size_type n = sTempText.find("%s");
-  if ( n != std::string::npos )
+  getFtpReply (215, sTempText);
+  std::string::size_type n = sTempText.find ("%s");
+  if (n != std::string::npos)
 #ifdef WIN32
-    sTempText.replace(n, 2, "WIN32");
+    sTempText.replace (n, 2, "WIN32");
 #else
-    sTempText.replace(n, 2, "UNIX Type: L8");
+    sTempText.replace (n, 2, "UNIX type: L8");
 #endif //WIN32
-  ftp_reply(215, sTempText);
+  ftpReply (215, sTempText);
 }
 
-void Ftp::Stat(const std::string &sParam/* = ""*/)
+void Ftp::stat (const std::string & sParam /* = "" */ )
 {
-  if ( !UserLoggedIn() )
+  if (!userLoggedIn ())
     return;
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
   //wait to finish data transfer
-  if ( !m_bAllowAsynchronousCmds )
-    WaitDataConnection();
+  if (!m_ballowAsynchronousCmds)
+    waitDataConnection ();
 
-  if ( pFtpUserData->m_nFtpState == FtpUserData::DATA_CONNECTION_UP )
-  {
-    std::ostringstream sStat;
-    sStat << "Transferring file: " << pFtpUserData->m_sCurrentFileName;
-    sStat << " " << pFtpUserData->m_nBytesSent << " bytes transferred from " << pFtpUserData->m_nFileSize;
-    ftp_reply(213, sStat.str());
-  }
+  if (pFtpuserData->m_nFtpstate == FtpuserData::DATA_CONNECTION_UP)
+    {
+      std::ostringstream sstat;
+      sstat << "Transferring file: " << pFtpuserData->m_sCurrentFileName;
+      sstat << " " << pFtpuserData->
+	m_nBytesSent << " bytes transferred from " << pFtpuserData->
+	m_nFileSize;
+      ftpReply (213, sstat.str ());
+    }
   else
-  {
-    //TODO: will be implemented later
-    ftp_reply(502);
-  }
+    {
+      //TODO: will be implemented later
+      ftpReply (502);
+    }
 }
 
-void Ftp::Retr(const std::string &sPath)
+void Ftp::retr (const std::string & sPath)
 {
-  RetrStor(true, false, sPath);
+  retrstor (true, false, sPath);
 }
 
-void Ftp::Stor(const std::string &sPath)
+void Ftp::stor (const std::string & sPath)
 {
-  if ( !m_bEnableStoreCmds )
-  {
-    ftp_reply(532);
-    return;
-  }
-  RetrStor(false, false, sPath);
+  if (!m_bEnablestoreCmds)
+    {
+      ftpReply (532);
+      return;
+    }
+  retrstor (false, false, sPath);
 }
 
-void Ftp::Stou(const std::string &sPath)
+void Ftp::stou (const std::string & sPath)
 {
-  if ( !m_bEnableStoreCmds )
-  {
-    ftp_reply(532);
-    return;
-  }
-  std::string sOutPath, sTempPath(sPath);
+  if (!m_bEnablestoreCmds)
+    {
+      ftpReply (532);
+      return;
+    }
+  std::string sOutPath, sTempPath (sPath);
   int nCount = -1;
   do
-  {
-    if ( nCount >= 0 )
     {
-      std::ostringstream sRename;
-      sRename << nCount;
-      sTempPath = sPath + sRename.str();
+      if (nCount >= 0)
+	{
+	  std::ostringstream sRename;
+	  sRename << nCount;
+	  sTempPath = sPath + sRename.str ();
+	}
+      if (!buildLocalPath (sTempPath, sOutPath))
+	return;
+      nCount++;
     }
-    if ( !BuildLocalPath(sTempPath, sOutPath) )
-      return;
-    nCount++;
-  } while ( FilesUtility::fileExists(sOutPath) );
-  RetrStor(false, false, sOutPath);
+  while (FilesUtility::fileExists (sOutPath));
+  retrstor (false, false, sOutPath);
 }
 
-void Ftp::Dele(const std::string &sPath)
+void Ftp::dele (const std::string & sPath)
 {
-  WaitDataConnection();
+  waitDataConnection ();
   std::string sLocalPath;
-  if ( !UserLoggedIn() || !GetLocalPath(sPath, sLocalPath) )
-    return;
-  if ( !m_bEnableStoreCmds )
-  {
-    ftp_reply(532);
+  if (!userLoggedIn () || !getLocalPath (sPath, sLocalPath))
     return;
-  }
+  if (!m_bEnablestoreCmds)
+    {
+      ftpReply (532);
+      return;
+    }
   std::string sLocalDir, sLocalFileName;
-  FilesUtility::splitPath(sLocalPath, sLocalDir, sLocalFileName);
+  FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
 
   /* The security file doesn't exist in any case.  */
   const char *secName = td.st.getHashedData ("security.filename",
-                                             MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
-                                             ".security.xml");
+					     MYSERVER_VHOST_CONF |
+					     MYSERVER_SERVER_CONF,
+					     ".security.xml");
 
-  if( !strcmpi(sLocalFileName.c_str(), secName) )
-  {
-    ftp_reply(550);
-    CloseDataConnection();
-    return;
-  }
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-
-  if ( strcmpi(pFtpUserData->m_sUserName.c_str(), "anonymous") == 0 )
-  {
-    if ( CheckRights("Guest", "", sLocalFileName, MYSERVER_PERMISSION_WRITE) == 0 )
+  if (!strcmpi (sLocalFileName.c_str (), secName))
     {
-      ftp_reply(550);
+      ftpReply (550);
+      closeDataConnection ();
       return;
     }
-  }
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+
+  if (strcmpi (pFtpuserData->m_suserName.c_str (), "anonymous") == 0)
+    {
+      if (checkRights ("Guest", "", sLocalFileName, MYSERVER_PERMISSION_WRITE)
+	  == 0)
+	{
+	  ftpReply (550);
+	  return;
+	}
+    }
   else
-  {
-    if ( CheckRights(pFtpUserData->m_sUserName, pFtpUserData->m_sPass, 
-      sLocalFileName, MYSERVER_PERMISSION_WRITE) == 0 )
     {
-      ftp_reply(550);
-      return;
+      if (checkRights (pFtpuserData->m_suserName, pFtpuserData->m_sPass,
+		       sLocalFileName, MYSERVER_PERMISSION_WRITE) == 0)
+	{
+	  ftpReply (550);
+	  return;
+	}
     }
-  }
-  if ( FilesUtility::deleteFile(sLocalPath) != 0 )
-    ftp_reply(450);
-  ftp_reply(250);
+  if (FilesUtility::deleteFile (sLocalPath) != 0)
+    ftpReply (450);
+  ftpReply (250);
 }
 
-void Ftp::Appe(const std::string &sPath)
+void Ftp::appe (const std::string & sPath)
 {
-  if ( !m_bEnableStoreCmds )
-  {
-    ftp_reply(532);
-    return;
-  }
-  RetrStor(false, true, sPath);
+  if (!m_bEnablestoreCmds)
+    {
+      ftpReply (532);
+      return;
+    }
+  retrstor (false, true, sPath);
 }
 
-void Ftp::Mkd(const std::string &sPath)
+void Ftp::mkd (const std::string & sPath)
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
-  if ( !m_bEnableStoreCmds )
-  {
-    ftp_reply(532);
-    return;
-  }
+  if (!m_bEnablestoreCmds)
+    {
+      ftpReply (532);
+      return;
+    }
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  std::string sLocalPath;// = pFtpUserData->m_cwd + "/" + sPath;
-  if ( !BuildLocalPath(sPath, sLocalPath) )
+  std::string sLocalPath;	// = pFtpuserData->m_cwd + "/" + sPath;
+  if (!buildLocalPath (sPath, sLocalPath))
     return;
 
-  if ( CheckRights(pFtpUserData->m_sUserName, pFtpUserData->m_sPass, 
-    sLocalPath, MYSERVER_PERMISSION_WRITE) == 0 )
-  {
-    ftp_reply(550);
-    return;
-  }
-  if ( FilesUtility::mkdir (sLocalPath) == 0 )
-    ftp_reply(250);
+  if (checkRights (pFtpuserData->m_suserName, pFtpuserData->m_sPass,
+		   sLocalPath, MYSERVER_PERMISSION_WRITE) == 0)
+    {
+      ftpReply (550);
+      return;
+    }
+  if (FilesUtility::mkdir (sLocalPath) == 0)
+    ftpReply (250);
   else
-    ftp_reply(501);
+    ftpReply (501);
 }
 
-void Ftp::Rmd(const std::string &sPath)
+void
+Ftp::rmd (const std::string & sPath)
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
-    return;
-  if ( sPath.empty() )
-  {
-    ftp_reply(550);
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
-  }
-  if ( !m_bEnableStoreCmds )
-  {
-    ftp_reply(532);
-    return;
-  }
+  if (sPath.empty ())
+    {
+      ftpReply (550);
+      return;
+    }
+  if (!m_bEnablestoreCmds)
+    {
+      ftpReply (532);
+      return;
+    }
 
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
   std::string sLocalPath;
-  if ( !GetLocalPath(sPath, sLocalPath) )
+  if (!getLocalPath (sPath, sLocalPath))
     return;
 
-  if ( CheckRights(pFtpUserData->m_sUserName, pFtpUserData->m_sPass, 
-    sLocalPath, MYSERVER_PERMISSION_WRITE) == 0 )
-  {
-    ftp_reply(550);
-    return;
-  }
-  if ( FilesUtility::rmdir (sLocalPath) == 0 )
-    ftp_reply(250);
+  if (checkRights (pFtpuserData->m_suserName, pFtpuserData->m_sPass,
+		   sLocalPath, MYSERVER_PERMISSION_WRITE) == 0)
+    {
+      ftpReply (550);
+      return;
+    }
+  if (FilesUtility::rmdir (sLocalPath) == 0)
+    ftpReply (250);
   else
-    ftp_reply(501);
+    ftpReply (501);
 }
 
-void Ftp::Rnfr(const std::string &sPath)
+void Ftp::rnfr (const std::string & sPath)
 {
-  WaitDataConnection();
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-  pFtpUserData->m_sRenameFrom = "";
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
+  pFtpuserData->m_sRenameFrom = "";
+  if (!userLoggedIn ())
     return;
   std::string sLocalPath;
-  if ( sPath.empty() || !GetLocalPath(sPath, sLocalPath) )
-  {
-    ftp_reply(550);
-    return;
-  }
+  if (sPath.empty () || !getLocalPath (sPath, sLocalPath))
+    {
+      ftpReply (550);
+      return;
+    }
   std::string sLocalDir, sLocalFileName;
-  FilesUtility::splitPath(sLocalPath, sLocalDir, sLocalFileName);
+  FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
 
   const char *secName = td.st.getHashedData ("security.filename",
-                                             MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
-                                             ".security.xml");
+					     MYSERVER_VHOST_CONF |
+					     MYSERVER_SERVER_CONF,
+					     ".security.xml");
 
   /* The security file doesn't exist in any case.  */
-  if( !strcmpi(sLocalFileName.c_str(), secName) )
-  {
-    ftp_reply(550);
-    return;
-  }
-  pFtpUserData->m_sRenameFrom = sLocalPath;
-  ftp_reply(350);
+  if (!strcmpi (sLocalFileName.c_str (), secName))
+    {
+      ftpReply (550);
+      return;
+    }
+  pFtpuserData->m_sRenameFrom = sLocalPath;
+  ftpReply (350);
 }
 
-void Ftp::Rnto(const std::string &sPath)
+void Ftp::Rnto (const std::string & sPath)
 {
-  WaitDataConnection();
-  if ( !UserLoggedIn() )
+  waitDataConnection ();
+  if (!userLoggedIn ())
     return;
   std::string sLocalPath;
-  if ( sPath.empty() || !BuildLocalPath(sPath, sLocalPath) )
-  {
-    ftp_reply(550);
-    return;
-  }
-  if ( !m_bEnableStoreCmds )
-  {
-    ftp_reply(532);
-    return;
-  }
+  if (sPath.empty () || !buildLocalPath (sPath, sLocalPath))
+    {
+      ftpReply (550);
+      return;
+    }
+  if (!m_bEnablestoreCmds)
+    {
+      ftpReply (532);
+      return;
+    }
 
   std::string sLocalDir, sLocalFileName;
-  FilesUtility::splitPath(sLocalPath, sLocalDir, sLocalFileName);
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  if ( CheckRights(pFtpUserData->m_sUserName, pFtpUserData->m_sPass, 
-    pFtpUserData->m_sRenameFrom, MYSERVER_PERMISSION_WRITE) == 0)
-  {
-    ftp_reply(550);
-    return;
-  }
+  if (checkRights (pFtpuserData->m_suserName, pFtpuserData->m_sPass,
+		   pFtpuserData->m_sRenameFrom,
+		   MYSERVER_PERMISSION_WRITE) == 0)
+    {
+      ftpReply (550);
+      return;
+    }
 
   const char *secName = td.st.getHashedData ("security.filename",
-                                             MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
-                                             ".security.xml");
+					     MYSERVER_VHOST_CONF |
+					     MYSERVER_SERVER_CONF,
+					     ".security.xml");
 
   /* The security file doesn't exist in any case.  */
-  if( !strcmpi(sLocalFileName.c_str(), secName) )
-  {
-    ftp_reply(550);
-    return;
-  }
-  FilesUtility::isLink(pFtpUserData->m_sRenameFrom);
-  if ( FilesUtility::renameFile(pFtpUserData->m_sRenameFrom, sLocalPath) )
-    ftp_reply(550);
+  if (!strcmpi (sLocalFileName.c_str (), secName))
+    {
+      ftpReply (550);
+      return;
+    }
+  FilesUtility::isLink (pFtpuserData->m_sRenameFrom);
+  if (FilesUtility::renameFile (pFtpuserData->m_sRenameFrom, sLocalPath))
+    ftpReply (550);
   else
-    ftp_reply(250);
+    ftpReply (250);
 }
 
-int Ftp::CheckRights(const std::string &sUser, const std::string &sPass, const std::string &sPath, int mask)
+int Ftp::checkRights (const std::string & suser, const std::string & sPass,
+                      const std::string & sPath, int mask)
 {
-  if ( sPath.empty() )
+  if (sPath.empty ())
     return 0;
-  std::string sDir(""), sFileName("");
-  if ( !FilesUtility::isDirectory(sPath.c_str()) )
-    FilesUtility::splitPath(sPath, sDir, sFileName);
+  std::string sDir (""), sFileName ("");
+  if (!FilesUtility::isDirectory (sPath.c_str ()))
+    FilesUtility::splitPath (sPath, sDir, sFileName);
   else
     sDir = sPath;
 
   string user;
   string password;
-  if ( strcmpi(sUser.c_str(), "anonymous") == 0 )
-  {
-    user.assign ("Guest");
-    password.assign("");
-  }
+  if (strcmpi (suser.c_str (), "anonymous") == 0)
+    {
+      user.assign ("Guest");
+      password.assign ("");
+    }
   else
-  {
-    user.assign (sUser);
-    password.assign (sPass);
-  }
+    {
+      user.assign (suser);
+      password.assign (sPass);
+    }
 
   td.st.setUser (user);
   td.st.setPassword (password);
 
-
   td.st.setDirectory (&sDir);
-  td.st.setSysDirectory ((string *)&(td.pConnection->host->getSystemRoot ()));
+  td.st.setSysDirectory ((string *) & (td.pConnection->host->getSystemRoot ()));
   td.st.setResource (&sFileName);
 
   AuthDomain auth (&td.st);
-  string validator (td.st.getHashedData ("sec.validator", MYSERVER_VHOST_CONF |
-                                      MYSERVER_SERVER_CONF, "xml"));
-  string authMethod (td.st.getHashedData ("sec.auth_method", MYSERVER_VHOST_CONF |
-                                       MYSERVER_SERVER_CONF, "xml"));
+  string validator (td.st.getHashedData ("sec.validator", MYSERVER_VHOST_CONF
+                                         | MYSERVER_SERVER_CONF, "xml"));
+  string authMethod (td.st.getHashedData ("sec.auth_method", MYSERVER_VHOST_CONF
+                                          | MYSERVER_SERVER_CONF, "xml"));
 
-  SecurityDomain* domains[] = {&auth, NULL};
+  SecurityDomain *domains[] = { &auth, NULL };
 
-  Server::getInstance()->getSecurityManager ()->getPermissionMask (&td.st, domains,
-                                                                   validator, authMethod);
+  Server::getInstance ()->getSecurityManager ()->getPermissionMask (&td.st,
+                                                                    domains,
+                                                                    validator,
+                                                                    authMethod);
 
   return (td.st.getMask () & mask);
 }
 
-void Ftp::Size(const std::string &sPath)
+void Ftp::size (const std::string & sPath)
 {
-  WaitDataConnection();
+  waitDataConnection ();
   std::string sLocalPath;
-  if ( !UserLoggedIn() || !GetLocalPath(sPath, sLocalPath) )
+
+  if (!userLoggedIn () || !getLocalPath (sPath, sLocalPath))
     return;
+
   std::string sLocalDir, sLocalFileName;
-  FilesUtility::splitPath(sLocalPath, sLocalDir, sLocalFileName);
+  FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
 
   /* The security file doesn't exist in any case.  */
   const char *secName = td.st.getHashedData ("security.filename",
-                                             MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
+                                             MYSERVER_VHOST_CONF |
+                                             MYSERVER_SERVER_CONF,
                                              ".security.xml");
-  if( !strcmpi(sLocalFileName.c_str(), secName))
-  {
-    ftp_reply(550);
-    CloseDataConnection();
-    return;
-  }
 
-  if ( sPath.empty() || !GetLocalPath(sPath, sLocalPath) )
+  if (!strcmpi (sLocalFileName.c_str (), secName))
     {
-      ftp_reply(550);
+      ftpReply (550);
+      closeDataConnection ();
       return;
     }
 
-  if (FilesUtility::isDirectory(sLocalPath.c_str ()))
+  if (sPath.empty () || !getLocalPath (sPath, sLocalPath))
+    {
+      ftpReply (550);
+      return;
+    }
+
+  if (FilesUtility::isDirectory (sLocalPath.c_str ()))
     {
-      ftp_reply(550);
+      ftpReply (550);
       return;
     }
 
   File f;
   if (f.openFile (sLocalPath.c_str (), File::OPEN_IF_EXISTS | File::READ))
     {
-      ftp_reply (550);
+      ftpReply (550);
       return;
     }
 
-  char size [12];
+  char size[12];
   sprintf (size, "%l", f.getFileSize ());
   f.close ();
 
-  ftp_reply(213, size);
+  ftpReply (213, size);
 }
 
-void Ftp::Allo(int nSize, int nRecordSize/* = -1*/)
+void Ftp::allo (int nSize, int nRecordSize /* = -1 */ )
 {
   //TODO: implement
-  Noop();
+  noop ();
 }
 
-void Ftp::WaitDataConnection()
+void Ftp::waitDataConnection ()
 {
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
+  FtpuserData *pFtpuserData =
+    static_cast < FtpuserData * >(td.pConnection->protocolBuffer);
 
-  pFtpUserData->m_DataConnBusy.lock();
-  pFtpUserData->m_DataConnBusy.unlock();
+  pFtpuserData->m_DataConnBusy.lock ();
+  pFtpuserData->m_DataConnBusy.unlock ();
 }
diff --git a/myserver/src/protocol/ftp/ftp_parser.cpp b/myserver/src/protocol/ftp/ftp_parser.cpp
index f5d25ed..deea0ab 100644
--- a/myserver/src/protocol/ftp/ftp_parser.cpp
+++ b/myserver/src/protocol/ftp/ftp_parser.cpp
@@ -231,7 +231,7 @@ typedef struct YYLTYPE
 /* Line 264 of yacc.c  */
 #line 22 "ftp_parser.ypp"
 
-#define yyscanner pContext->GetScanner()
+#define yyscanner pContext->getScanner()
 
 
 /* Line 264 of yacc.c  */
@@ -1617,7 +1617,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 94 "ftp_parser.ypp"
     {
-			pContext->ComputeParseLength((yyloc));
+			pContext->computeParseLength((yyloc));
 		}
     break;
 
@@ -1626,7 +1626,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 100 "ftp_parser.ypp"
     {
-			pContext->User((yyvsp[(3) - (4)].m_szStr));
+			pContext->user((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1635,7 +1635,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 104 "ftp_parser.ypp"
     {
-			pContext->Password((yyvsp[(3) - (4)].m_szStr));
+			pContext->password((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1644,7 +1644,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 108 "ftp_parser.ypp"
     {
-		  pContext->Port((yyvsp[(3) - (4)].m_host));
+		  pContext->port((yyvsp[(3) - (4)].m_host));
 		}
     break;
 
@@ -1653,7 +1653,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 112 "ftp_parser.ypp"
     {
-		  pContext->Pasv();
+		  pContext->pasv();
 		}
     break;
 
@@ -1662,7 +1662,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 116 "ftp_parser.ypp"
     {
-		  pContext->Mode((yyvsp[(3) - (4)].m_nInt));
+		  pContext->mode((yyvsp[(3) - (4)].m_nInt));
 		}
     break;
 
@@ -1672,9 +1672,9 @@ yyreduce:
 #line 120 "ftp_parser.ypp"
     {
       if ((yyvsp[(3) - (4)].m_nInt) == -1)
-        pContext->ftp_reply(504);
+        pContext->ftpReply(504);
       else
-        pContext->Type((yyvsp[(3) - (4)].m_nInt));
+        pContext->type((yyvsp[(3) - (4)].m_nInt));
 		}
     break;
 
@@ -1684,9 +1684,9 @@ yyreduce:
 #line 127 "ftp_parser.ypp"
     {
       if ((yyvsp[(3) - (6)].m_nInt) == -1 || (yyvsp[(5) - (6)].m_nInt) == -1)
-        pContext->ftp_reply(504);
+        pContext->ftpReply(504);
       else
-        pContext->Type((yyvsp[(3) - (6)].m_nInt), (yyvsp[(5) - (6)].m_nInt));
+        pContext->type((yyvsp[(3) - (6)].m_nInt), (yyvsp[(5) - (6)].m_nInt));
 		}
     break;
 
@@ -1695,7 +1695,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 134 "ftp_parser.ypp"
     {
-		  pContext->Stru((yyvsp[(3) - (4)].m_nInt));
+		  pContext->stru((yyvsp[(3) - (4)].m_nInt));
 		}
     break;
 
@@ -1704,7 +1704,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 138 "ftp_parser.ypp"
     {
-		  pContext->Rest((yyvsp[(3) - (4)].m_szStr));
+		  pContext->rest((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1713,7 +1713,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 142 "ftp_parser.ypp"
     {
-		  pContext->Allo((yyvsp[(3) - (4)].m_nInt));
+		  pContext->allo((yyvsp[(3) - (4)].m_nInt));
 		}
     break;
 
@@ -1722,7 +1722,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 146 "ftp_parser.ypp"
     {
-		  pContext->Allo((yyvsp[(3) - (8)].m_nInt), (yyvsp[(7) - (8)].m_nInt));
+		  pContext->allo((yyvsp[(3) - (8)].m_nInt), (yyvsp[(7) - (8)].m_nInt));
 		}
     break;
 
@@ -1731,7 +1731,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 150 "ftp_parser.ypp"
     {
-		  pContext->Retr((yyvsp[(3) - (4)].m_szStr));
+		  pContext->retr((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1740,7 +1740,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 154 "ftp_parser.ypp"
     {
-			pContext->Abor();
+			pContext->abor();
 		}
     break;
 
@@ -1749,7 +1749,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 158 "ftp_parser.ypp"
     {
-		  pContext->List();
+		  pContext->list();
 		}
     break;
 
@@ -1758,7 +1758,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 162 "ftp_parser.ypp"
     {
-		  pContext->List((yyvsp[(3) - (4)].m_szStr));
+		  pContext->list((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1767,7 +1767,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 166 "ftp_parser.ypp"
     {
-		  pContext->Nlst();
+		  pContext->nlst();
 		}
     break;
 
@@ -1776,7 +1776,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 170 "ftp_parser.ypp"
     {
-		  pContext->Nlst((yyvsp[(3) - (4)].m_szStr));
+		  pContext->nlst((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1785,7 +1785,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 174 "ftp_parser.ypp"
     {
-			pContext->Cwd((yyvsp[(3) - (4)].m_szStr));
+			pContext->cwd((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1794,7 +1794,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 178 "ftp_parser.ypp"
     {
-			pContext->Cwd("..");
+			pContext->cwd("..");
 		}
     break;
 
@@ -1803,7 +1803,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 182 "ftp_parser.ypp"
     {
-			pContext->Pwd();
+			pContext->pwd();
 		}
     break;
 
@@ -1812,7 +1812,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 186 "ftp_parser.ypp"
     {
-			pContext->Help((yyvsp[(3) - (4)].m_szStr));
+			pContext->help((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1821,7 +1821,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 190 "ftp_parser.ypp"
     {
-			pContext->Help();
+			pContext->help();
 		}
     break;
 
@@ -1830,7 +1830,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 194 "ftp_parser.ypp"
     {
-			pContext->Syst();
+			pContext->syst();
 		}
     break;
 
@@ -1839,7 +1839,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 198 "ftp_parser.ypp"
     {
-			pContext->Stat();
+			pContext->stat();
 		}
     break;
 
@@ -1848,7 +1848,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 202 "ftp_parser.ypp"
     {
-			pContext->Quit();
+			pContext->quit();
 		}
     break;
 
@@ -1857,7 +1857,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 206 "ftp_parser.ypp"
     {
-			pContext->Noop();
+			pContext->noop();
 		}
     break;
 
@@ -1866,7 +1866,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 210 "ftp_parser.ypp"
     {
-			pContext->ftp_reply(502);//any new commands
+			pContext->ftpReply(502);//any new commands
 		}
     break;
 
@@ -1875,7 +1875,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 214 "ftp_parser.ypp"
     {
-			pContext->ftp_reply(502);//any new commands
+			pContext->ftpReply(502);//any new commands
 		}
     break;
 
@@ -1893,7 +1893,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 222 "ftp_parser.ypp"
     {
-		  pContext->Stor((yyvsp[(3) - (4)].m_szStr));
+		  pContext->stor((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1902,7 +1902,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 226 "ftp_parser.ypp"
     {
-		  pContext->Stou((yyvsp[(3) - (4)].m_szStr));
+		  pContext->stou((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1911,7 +1911,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 230 "ftp_parser.ypp"
     {
-		  pContext->Dele((yyvsp[(3) - (4)].m_szStr));
+		  pContext->dele((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1920,7 +1920,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 234 "ftp_parser.ypp"
     {
-		  pContext->Appe((yyvsp[(3) - (4)].m_szStr));
+		  pContext->appe((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1929,7 +1929,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 238 "ftp_parser.ypp"
     {
-		  pContext->Mkd((yyvsp[(3) - (4)].m_szStr));
+		  pContext->mkd((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1938,7 +1938,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 242 "ftp_parser.ypp"
     {
-		  pContext->Rmd((yyvsp[(3) - (4)].m_szStr));
+		  pContext->rmd((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1947,7 +1947,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 246 "ftp_parser.ypp"
     {
-		  pContext->Rnfr((yyvsp[(3) - (4)].m_szStr));
+		  pContext->rnfr((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -1974,7 +1974,7 @@ yyreduce:
 #line 257 "ftp_parser.ypp"
     {
 			//pContext->Chmod($3, $5);
-			pContext->ftp_reply(502);
+			pContext->ftpReply(502);
 		}
     break;
 
@@ -1984,7 +1984,7 @@ yyreduce:
 #line 262 "ftp_parser.ypp"
     {
 			//pContext->Utime($3, $5);
-			pContext->ftp_reply(502);
+			pContext->ftpReply(502);
 		}
     break;
 
@@ -1993,7 +1993,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 268 "ftp_parser.ypp"
     {
-			pContext->Size((yyvsp[(3) - (4)].m_szStr));
+			pContext->size((yyvsp[(3) - (4)].m_szStr));
 		}
     break;
 
@@ -2038,7 +2038,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 302 "ftp_parser.ypp"
     {
-		  (yyval.m_nInt) = FtpUserData::MODE_STREAM;
+		  (yyval.m_nInt) = FtpuserData::MODE_STREAM;
 		}
     break;
 
@@ -2065,7 +2065,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 316 "ftp_parser.ypp"
     {
-			(yyval.m_nInt) = FtpUserData::STRU_FILE;
+			(yyval.m_nInt) = FtpuserData::STRU_FILE;
 		}
     break;
 
@@ -2092,7 +2092,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 330 "ftp_parser.ypp"
     {
-		  (yyval.m_nInt) = FtpUserData::REPR_ASCII;
+		  (yyval.m_nInt) = FtpuserData::REPR_ASCII;
 		}
     break;
 
@@ -2101,7 +2101,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 334 "ftp_parser.ypp"
     {
-		  (yyval.m_nInt) = FtpUserData::REPR_IMAGE;
+		  (yyval.m_nInt) = FtpuserData::REPR_IMAGE;
 		}
     break;
 
@@ -2128,7 +2128,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 348 "ftp_parser.ypp"
     {
-		  (yyval.m_nInt) = FtpUserData::NON_PRINT;
+		  (yyval.m_nInt) = FtpuserData::NON_PRINT;
 		}
     break;
 
@@ -2375,27 +2375,27 @@ yyreturn:
 #line 360 "ftp_parser.ypp"
 
 
-int Ftp::ParseControlConnection()
+int Ftp::parseControlConnection()
 {
 	if ( td.buffer == NULL || td.buffer->getBuffer() == NULL )
 		return ClientsThread::DELETE_CONNECTION;
-	FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-	if ( pFtpUserData == NULL )
+	FtpuserData *pFtpuserData = static_cast<FtpuserData *>(td.pConnection->protocolBuffer);
+	if ( pFtpuserData == NULL )
 		return ClientsThread::DELETE_CONNECTION;
 
 	// awaiting commands reply
-	if ( pFtpUserData->m_nFtpState <= FtpUserData::NO_CONTROL_CONNECTION )
+	if ( pFtpuserData->m_nFtpstate <= FtpuserData::NO_CONTROL_CONNECTION )
 	{
-		ftp_reply(220);
-		pFtpUserData->m_nFtpState = FtpUserData::CONTROL_CONNECTION_UP;
+		ftpReply(220);
+		pFtpuserData->m_nFtpstate = FtpuserData::CONTROL_CONNECTION_UP;
 	}
 
 	MemBuf out;
-	EscapeTelnet(*td.buffer, out);
+	escapeTelnet(*td.buffer, out);
 	if ( !m_bEnablePipelining )
 	{
 		MemBuf tmpBuff(out);
-		RemovePipelinedCmds(tmpBuff, out);
+		removePipelinedCmds(tmpBuff, out);
 	}
 	char *pBuffToParse = out.getBuffer();
 
@@ -2405,14 +2405,14 @@ int Ftp::ParseControlConnection()
 		pBuffToParse += td.m_nParseLength;
 
 	yylex_init(&m_scanner);
-	yy_buffer_state *bufState = yy_scan_string (pBuffToParse, m_scanner);
+	yy_buffer_state *bufstate = yy_scan_string (pBuffToParse, m_scanner);
 	int nParserRet = yyparse(this);
-	yy_delete_buffer(bufState, m_scanner);
+	yy_delete_buffer(bufstate, m_scanner);
 	yylex_destroy(m_scanner);
 	switch ( nParserRet )
 	{
 		case 0:
-			if ( pFtpUserData->m_nFtpState == FtpUserData::NO_CONTROL_CONNECTION )
+			if ( pFtpuserData->m_nFtpstate == FtpuserData::NO_CONTROL_CONNECTION )
 				return ClientsThread::DELETE_CONNECTION;
 			else
 				return ClientsThread::KEEP_CONNECTION;
@@ -2426,7 +2426,7 @@ int Ftp::ParseControlConnection()
 	return ClientsThread::DELETE_CONNECTION;
 }
 
-u_long Ftp::ComputeParseLength(const YYLTYPE &location)
+u_long Ftp::computeParseLength(const YYLTYPE &location)
 {
 	if ( td.buffer == NULL )
 		return 1;
@@ -2457,6 +2457,6 @@ void yyerror(YYLTYPE *pLoc, Ftp *pContext, const char *msg)
 {
 	if ( pContext == NULL )
 		return;
-	pContext->PrintError(msg);
+	pContext->printError(msg);
 }
 
diff --git a/myserver/src/protocol/ftp/ftp_parser.ypp b/myserver/src/protocol/ftp/ftp_parser.ypp
index d011c01..589a4d3 100755
--- a/myserver/src/protocol/ftp/ftp_parser.ypp
+++ b/myserver/src/protocol/ftp/ftp_parser.ypp
@@ -20,7 +20,7 @@
 }
 
 %{
-#define yyscanner pContext->GetScanner()
+#define yyscanner pContext->getScanner()
 %}
 
 /* general tokens */
@@ -92,127 +92,127 @@
 cmd_list	:/* empty */
 		| cmd_list cmd
 		{
-			pContext->ComputeParseLength(@$);
+			pContext->computeParseLength(@$);
 		}
 		;
 	/* Minimal FTP implementation */
 cmd		: USER_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-			pContext->User($3);
+			pContext->user($3);
 		}
 		| PASS_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-			pContext->Password($3);
+			pContext->password($3);
 		}
 		| PORT_FTP_COMMAND SPACE_FTP_SEP host_port CRLF_FTP_SEP
 		{
-		  pContext->Port($3);
+		  pContext->port($3);
 		}
 		| PASV_FTP_COMMAND CRLF_FTP_SEP
 		{
-		  pContext->Pasv();
+		  pContext->pasv();
 		}
 		| MODE_FTP_COMMAND SPACE_FTP_SEP mode_code CRLF_FTP_SEP
 		{
-		  pContext->Mode($3);
+		  pContext->mode($3);
 		}
 		| TYPE_FTP_COMMAND SPACE_FTP_SEP type_code CRLF_FTP_SEP
 		{
       if ($3 == -1)
-        pContext->ftp_reply(504);
+        pContext->ftpReply(504);
       else
-        pContext->Type($3);
+        pContext->type($3);
 		}
 		| TYPE_FTP_COMMAND SPACE_FTP_SEP type_code SPACE_FTP_SEP format_control_code CRLF_FTP_SEP
 		{
       if ($3 == -1 || $5 == -1)
-        pContext->ftp_reply(504);
+        pContext->ftpReply(504);
       else
-        pContext->Type($3, $5);
+        pContext->type($3, $5);
 		}
 		| STRU_FTP_COMMAND SPACE_FTP_SEP structure_code CRLF_FTP_SEP
 		{
-		  pContext->Stru($3);
+		  pContext->stru($3);
 		}
 		| REST_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Rest($3);
+		  pContext->rest($3);
 		}
 		| ALLO_FTP_COMMAND SPACE_FTP_SEP NUMBER_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Allo($3);
+		  pContext->allo($3);
 		}
 		| ALLO_FTP_COMMAND SPACE_FTP_SEP NUMBER_FTP_ARG SPACE_FTP_SEP 'r' SPACE_FTP_SEP NUMBER_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Allo($3, $7);
+		  pContext->allo($3, $7);
 		}
 		| RETR_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Retr($3);
+		  pContext->retr($3);
 		}
 		| ABOR_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Abor();
+			pContext->abor();
 		}
 		| LIST_FTP_COMMAND CRLF_FTP_SEP
 		{
-		  pContext->List();
+		  pContext->list();
 		}
 		| LIST_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->List($3);
+		  pContext->list($3);
 		}
 		| NLST_FTP_COMMAND CRLF_FTP_SEP
 		{
-		  pContext->Nlst();
+		  pContext->nlst();
 		}
 		| NLST_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Nlst($3);
+		  pContext->nlst($3);
 		}
 		| CWD_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-			pContext->Cwd($3);
+			pContext->cwd($3);
 		}
 		| CDUP_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Cwd("..");
+			pContext->cwd("..");
 		}
 		| PWD_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Pwd();
+			pContext->pwd();
 		}
 		| HELP_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-			pContext->Help($3);
+			pContext->help($3);
 		}
 		| HELP_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Help();
+			pContext->help();
 		}
 		| SYST_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Syst();
+			pContext->syst();
 		}
 		| STAT_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Stat();
+			pContext->stat();
 		}
 		| QUIT_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Quit();
+			pContext->quit();
 		}
 		| NOOP_FTP_COMMAND CRLF_FTP_SEP
 		{
-			pContext->Noop();
+			pContext->noop();
 		}
 		| STRING_FTP_ARG SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-			pContext->ftp_reply(502);//any new commands
+			pContext->ftpReply(502);//any new commands
 		}
 		| STRING_FTP_ARG CRLF_FTP_SEP
 		{
-			pContext->ftp_reply(502);//any new commands
+			pContext->ftpReply(502);//any new commands
 		}
 		| CRLF_FTP_SEP
 		{
@@ -220,31 +220,31 @@ cmd		: USER_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		}
 		| STOR_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Stor($3);
+		  pContext->stor($3);
 		}
 		| STOU_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Stou($3);
+		  pContext->stou($3);
 		}
 		| DELE_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Dele($3);
+		  pContext->dele($3);
 		}
 		| APPE_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Appe($3);
+		  pContext->appe($3);
 		}
 		| MKD_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Mkd($3);
+		  pContext->mkd($3);
 		}
 		| RMD_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Rmd($3);
+		  pContext->rmd($3);
 		}
 		| RNFR_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-		  pContext->Rnfr($3);
+		  pContext->rnfr($3);
 		}
 		| RNTO_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
@@ -256,17 +256,17 @@ cmd		: USER_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		| CHMOD_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
 			//pContext->Chmod($3, $5);
-			pContext->ftp_reply(502);
+			pContext->ftpReply(502);
 		}
 		| UTIME_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
 			//pContext->Utime($3, $5);
-			pContext->ftp_reply(502);
+			pContext->ftpReply(502);
 		}
 		/* RFC 3659 commands*/
 		| SIZE_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG CRLF_FTP_SEP
 		{
-			pContext->Size($3);
+			pContext->size($3);
 		}
 		;
 
@@ -300,7 +300,7 @@ port_number	: NUMBER_FTP_ARG ',' NUMBER_FTP_ARG
 
 mode_code	: 's'
 		{
-		  $$ = FtpUserData::MODE_STREAM;
+		  $$ = FtpuserData::MODE_STREAM;
 		}
 		| 'b'
 		{
@@ -314,7 +314,7 @@ mode_code	: 's'
 
 structure_code	: 'f'
 		{
-			$$ = FtpUserData::STRU_FILE;
+			$$ = FtpuserData::STRU_FILE;
 		}
 		| 'r'
 		{
@@ -328,11 +328,11 @@ structure_code	: 'f'
 
 type_code	: 'a'
 		{
-		  $$ = FtpUserData::REPR_ASCII;
+		  $$ = FtpuserData::REPR_ASCII;
 		}
 		| 'i'
 		{
-		  $$ = FtpUserData::REPR_IMAGE;
+		  $$ = FtpuserData::REPR_IMAGE;
 		}
 		| 'e'
 		{
@@ -346,7 +346,7 @@ type_code	: 'a'
 
 format_control_code : 'n'
 		{
-		  $$ = FtpUserData::NON_PRINT;
+		  $$ = FtpuserData::NON_PRINT;
 		}
 		| 't'
 		{
@@ -359,27 +359,27 @@ format_control_code : 'n'
 		;
 %%
 
-int Ftp::ParseControlConnection()
+int Ftp::parseControlConnection()
 {
 	if ( td.buffer == NULL || td.buffer->getBuffer() == NULL )
 		return ClientsThread::DELETE_CONNECTION;
-	FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
-	if ( pFtpUserData == NULL )
+	FtpuserData *pFtpuserData = static_cast<FtpuserData *>(td.pConnection->protocolBuffer);
+	if ( pFtpuserData == NULL )
 		return ClientsThread::DELETE_CONNECTION;
 
 	// awaiting commands reply
-	if ( pFtpUserData->m_nFtpState <= FtpUserData::NO_CONTROL_CONNECTION )
+	if ( pFtpuserData->m_nFtpstate <= FtpuserData::NO_CONTROL_CONNECTION )
 	{
-		ftp_reply(220);
-		pFtpUserData->m_nFtpState = FtpUserData::CONTROL_CONNECTION_UP;
+		ftpReply(220);
+		pFtpuserData->m_nFtpstate = FtpuserData::CONTROL_CONNECTION_UP;
 	}
 
 	MemBuf out;
-	EscapeTelnet(*td.buffer, out);
+	escapeTelnet(*td.buffer, out);
 	if ( !m_bEnablePipelining )
 	{
 		MemBuf tmpBuff(out);
-		RemovePipelinedCmds(tmpBuff, out);
+		removePipelinedCmds(tmpBuff, out);
 	}
 	char *pBuffToParse = out.getBuffer();
 
@@ -389,14 +389,14 @@ int Ftp::ParseControlConnection()
 		pBuffToParse += td.m_nParseLength;
 
 	yylex_init(&m_scanner);
-	yy_buffer_state *bufState = yy_scan_string (pBuffToParse, m_scanner);
+	yy_buffer_state *bufstate = yy_scan_string (pBuffToParse, m_scanner);
 	int nParserRet = yyparse(this);
-	yy_delete_buffer(bufState, m_scanner);
+	yy_delete_buffer(bufstate, m_scanner);
 	yylex_destroy(m_scanner);
 	switch ( nParserRet )
 	{
 		case 0:
-			if ( pFtpUserData->m_nFtpState == FtpUserData::NO_CONTROL_CONNECTION )
+			if ( pFtpuserData->m_nFtpstate == FtpuserData::NO_CONTROL_CONNECTION )
 				return ClientsThread::DELETE_CONNECTION;
 			else
 				return ClientsThread::KEEP_CONNECTION;
@@ -410,7 +410,7 @@ int Ftp::ParseControlConnection()
 	return ClientsThread::DELETE_CONNECTION;
 }
 
-u_long Ftp::ComputeParseLength(const YYLTYPE &location)
+u_long Ftp::computeParseLength(const YYLTYPE &location)
 {
 	if ( td.buffer == NULL )
 		return 1;
@@ -441,5 +441,5 @@ void yyerror(YYLTYPE *pLoc, Ftp *pContext, const char *msg)
 {
 	if ( pContext == NULL )
 		return;
-	pContext->PrintError(msg);
+	pContext->printError(msg);
 }
diff --git a/myserver/tests/test_ftp.cpp b/myserver/tests/test_ftp.cpp
index 52dab44..2696020 100644
--- a/myserver/tests/test_ftp.cpp
+++ b/myserver/tests/test_ftp.cpp
@@ -1,6 +1,6 @@
 /*
  MyServer
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 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
@@ -24,28 +24,28 @@
 
 class TestFtp : public CppUnit::TestFixture
 {
-	CPPUNIT_TEST_SUITE( TestFtp );
-	CPPUNIT_TEST( testEscapeTelnet );
-	CPPUNIT_TEST_SUITE_END();
+	CPPUNIT_TEST_SUITE (TestFtp);
+	CPPUNIT_TEST (testEscapeTelnet);
+	CPPUNIT_TEST_SUITE_END ();
 
 public:
-	void setUp() {}
-	void tearDown() {}
-	void testEscapeTelnet()
+	void setUp () {}
+	void tearDown () {}
+	void testEscapeTelnet ()
 	{
 		MemBuf inBuf, outBuf;
 		inBuf << "\377\366RE\377\374TTR abc\377\377def\015\377\376\012\012";
 
 		Ftp ftp;
-		ftp.EscapeTelnet(inBuf, outBuf);
+		ftp.escapeTelnet (inBuf, outBuf);
 		char szOut[128], szExpected[128];
-		memset(szOut, 0, 128);
-		strncpy(szOut, outBuf.getBuffer(), outBuf.getLength());
-		memset(szExpected, 0, 128);
-		strcpy(szExpected, "RETR abc\377def\015\012");
+		memset (szOut, 0, 128);
+		strncpy (szOut, outBuf.getBuffer (), outBuf.getLength ());
+		memset (szExpected, 0, 128);
+		strcpy (szExpected, "RETR abc\377def\015\012");
 
-		CPPUNIT_ASSERT( strcmp(szOut, szExpected) == 0);
+		CPPUNIT_ASSERT (strcmp (szOut, szExpected) == 0);
 	}
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestFtp );
+CPPUNIT_TEST_SUITE_REGISTRATION (TestFtp);



commit d0e7b4fab291566dd9f2e2dbf141e70ca96714c1
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Jul 15 21:33:07 2009 +0200

    Removed unused local variable.

diff --git a/myserver/src/protocol/ftp/ftp.cpp b/myserver/src/protocol/ftp/ftp.cpp
index 5d6e5b6..20b32e2 100755
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -2454,7 +2454,6 @@ void Ftp::Size(const std::string &sPath)
     CloseDataConnection();
     return;
   }
-  FtpUserData *pFtpUserData = static_cast<FtpUserData *>(td.pConnection->protocolBuffer);
 
   if ( sPath.empty() || !GetLocalPath(sPath, sLocalPath) )
     {

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/protocol/ftp/ftp.h        |  325 ++--
 myserver/include/protocol/ftp/ftp_common.h |   16 +-
 myserver/src/protocol/ftp/ftp.cpp          | 3130 ++++++++++++++--------------
 myserver/src/protocol/ftp/ftp_parser.cpp   |  120 +-
 myserver/src/protocol/ftp/ftp_parser.ypp   |  120 +-
 myserver/tests/test_ftp.cpp                |   28 +-
 6 files changed, 1928 insertions(+), 1811 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 15 18:54:37 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MRDMz-0005wQ-88
	for mharc-myserver-commit@gnu.org; Wed, 15 Jul 2009 18:54:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MRDMw-0005uE-2O
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 18:54:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MRDMv-0005tj-0B
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 18:54:33 -0400
Received: from [199.232.76.173] (port=46084 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MRDMu-0005tg-Sa
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 18:54:32 -0400
Received: from savannah.gnu.org ([199.232.41.3]:44188 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 1MRDMu-0001AE-47
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 18:54:32 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <dperrone@it.gnu.org>) id 1MRDMt-0007Qr-Ke
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 22:54:31 +0000
Received: from dperrone by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <dperrone@savannah.gnu.org>) id 1MRDMr-0007Q1-8x
	for myserver-commit@gnu.org; Wed, 15 Jul 2009 22:54:31 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ef37279196c467a7c8dfb669fc8bc22e6ce7fd38
X-Git-Newrev: 205cc0f5386bee92fb0e215287bdafd316549c90
Message-Id: <E1MRDMr-0007Q1-8x@cvs.savannah.gnu.org>
From: Daniele Perrone <dperrone@it.gnu.org>
Date: Wed, 15 Jul 2009 22:54:30 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 205cc0f5386bee92fb0e215287bdafd316549c90
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: Wed, 15 Jul 2009 22:54:34 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  205cc0f5386bee92fb0e215287bdafd316549c90 (commit)
      from  ef37279196c467a7c8dfb669fc8bc22e6ce7fd38 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 205cc0f5386bee92fb0e215287bdafd316549c90
Author: Daniele Perrone <dperrone@it.gnu.org>
Date:   Thu Jul 16 00:52:55 2009 +0200

    Fixed bugs on plugins loading and dependeces checking.

diff --git a/myserver/include/plugin/plugins_manager.h b/myserver/include/plugin/plugins_manager.h
index effe197..b1ceffe 100755
--- a/myserver/include/plugin/plugins_manager.h
+++ b/myserver/include/plugin/plugins_manager.h
@@ -66,7 +66,7 @@ public:
 private:
   HashMap<string, PluginInfo*> pluginsInfos;
   int loadOptions (Server *server);
-  void recursiveDependencesFallDown (Server* server, string name, HashMap<string, bool> remove, HashMap<string, list<string>*> dependsOn);
+  void recursiveDependencesFallDown (Server* server, string &name, HashMap<string, bool> &remove, HashMap<string, list<string>*> &dependsOn);
   Plugin* preLoadPlugin (string& file, Server* server, bool global);
 
   PluginInfo* loadInfo (Server* server, string& name, string& path);
diff --git a/myserver/src/plugin/plugins_manager.cpp b/myserver/src/plugin/plugins_manager.cpp
index cbad7e3..e00fef1 100755
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -21,7 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <include/base/find_data/find_data.h>
 #include <include/server/server.h>
 #include <include/base/string/stringutils.h>
+#include <list>
 #include <string>
+
 using namespace std;
 
 /*!
@@ -99,7 +101,7 @@ PluginsManager::loadOptions (Server *server)
       if (!plugin.length ())
         {
           string error;
-          error.assign ("PLUGINS MANAGER<Warning>: invalid plugin name in PLUGIN block.");
+          error.assign ("Invalid plugin name in PLUGIN block.");
           server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_WARNING);
           ret = -1;
         }
@@ -126,7 +128,7 @@ PluginsManager::preLoad (Server* server,
   string filename;
   string completeFileName;
   int ret;
-
+  HashMap<string, bool> alreadyCkeched;
   loadOptions (server);
 
   filename.assign (resource);
@@ -137,7 +139,7 @@ PluginsManager::preLoad (Server* server,
 
   if (ret == -1)
     {
-      server->logWriteln ("PLUGINS MANAGER<Error>: Invalid plugins source.", MYSERVER_LOG_MSG_ERROR);
+      server->logWriteln ("Invalid plugins source.", MYSERVER_LOG_MSG_ERROR);
       return ret;
     }
 
@@ -178,7 +180,12 @@ PluginsManager::preLoad (Server* server,
           completeFileName.append (flib.name);
 
           string pname (fdir.name);
+
+          if (alreadyCkeched.get (pname))
+            continue;
+
           PluginInfo* pinfo = loadInfo (server, pname, completeFileName);
+          alreadyCkeched.put (pname,true);
           if (!pinfo)
             {
               ret |= 1;
@@ -201,7 +208,7 @@ PluginsManager::preLoad (Server* server,
                 {
                   ret |= 1;
                   string error;
-                  error.append ("PLUGINS MANAGER<Error>: Unable to enable plugin ");
+                  error.append ("Unable to enable plugin ");
                   error.append (name);
                   error.append (".");
                   server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
@@ -237,26 +244,21 @@ PluginInfo*
 PluginsManager::loadInfo (Server* server, string& name, string& path)
 {
   PluginInfo* pinfo;
-
   pinfo = getPluginInfo (name);
   if (!pinfo)
     pinfo = new PluginInfo (name);
   else
     if (pinfo->getVersion () != 0)
     {
-      string error;
-      error.append ("PLUGINS MANAGER<Error>: a version of plugin ");
-      error.append (name);
-      error.append (" is already loading.");
-      server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
       return NULL;
     }
   XmlParser xml;
 
+
   if (xml.open (path, true))
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to load plugin ");
+      error.append ("Unable to load plugin ");
       error.append (name);
       error.append (" info.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
@@ -273,9 +275,9 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
   if (size != 1)
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to load plugin ");
+      error.append ("Unable to load plugin ");
       error.append (name);
-      error.append (" info, bad plugin.xml format.");
+      error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
       return NULL;
     }
@@ -289,9 +291,9 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
   else
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to load plugin ");
+      error.append ("Unable to load plugin ");
       error.append (name);
-      error.append (" info, bad plugin.xml format.");
+      error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
       return NULL;
     }
@@ -307,9 +309,9 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
   else
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to load plugin ");
+      error.append ("Unable to load plugin ");
       error.append (name);
-      error.append (" info, bad plugin.xml format.");
+      error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
       return NULL;
     }
@@ -324,9 +326,9 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
   if (size != 1)
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to load plugin ");
+      error.append ("Unable to load plugin ");
       error.append (name);
-      error.append (" info, bad plugin.xml format.");
+      error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
       return NULL;
     }
@@ -348,21 +350,26 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
   if (size != 1)
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to load plugin ");
+      error.append ("Unable to load plugin ");
       error.append (name);
-      error.append (" info, bad plugin.xml format.");
+      error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
       return NULL;
     }
 
 
-
-  const char* version = (const char*) nodes->nodeTab[0]->content;
-
-
-
-  pinfo->setVersion (PluginInfo::convertVersion (new string (version)));
-
+  int version = PluginInfo::convertVersion (new string ((char*) nodes->nodeTab[0]->content));
+  if (version!=-1)
+    pinfo->setVersion (version);
+  else
+    {
+      string error;
+      error.append ("Unable to load plugin ");
+      error.append (name);
+      error.append (", bad plugin.xml format.");
+      server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      return NULL;
+    }
 
   delete xpathRes;
 
@@ -380,18 +387,28 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
       if (!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "min-version") || !xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "max-version"))
         {
           string error;
-          error.append ("PLUGINS MANAGER<Error>: unable to load plugin ");
+          error.append ("Unable to load plugin ");
           error.append (name);
-          error.append (" info, bad plugin.xml format.");
+          error.append (", bad plugin.xml format.");
           server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
           return NULL;
         }
 
-      const char* minVersion = (const char*) xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "min-version");
+      int minVersion = PluginInfo::convertVersion (new string ((char*) xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "min-version")));
 
-      const char* maxVersion = (const char*) xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "max-version");
+      int maxVersion = PluginInfo::convertVersion (new string ((char*) xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "max-version")));
+
+      if (minVersion == -1 || maxVersion == -1)
+                {
+          string error;
+          error.append ("Unable to load plugin ");
+          error.append (name);
+          error.append (", bad plugin.xml format.");
+          server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+          return NULL;
+        }
 
-      pinfo->addDependence (nameDep, PluginInfo::convertVersion (new string (minVersion)), PluginInfo::convertVersion (new string (maxVersion)));
+      pinfo->addDependence (nameDep, minVersion, maxVersion);
     }
 
   xmlFree (xpathRes);
@@ -418,7 +435,7 @@ PluginsManager::preLoadPlugin (string& file, Server* server, bool global)
   if (plugin->preLoad (file, global))
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to pre-load plugin ");
+      error.append ("Unable to pre-load plugin ");
       error.append (name);
       error.append (".");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
@@ -432,7 +449,7 @@ PluginsManager::preLoadPlugin (string& file, Server* server, bool global)
   else
     {
       string error;
-      error.append ("PLUGINS MANAGER<Error>: unable to pre-load plugin ");
+      error.append ("Unable to pre-load plugin ");
       error.append (name);
       error.append (".");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
@@ -444,7 +461,7 @@ PluginsManager::preLoadPlugin (string& file, Server* server, bool global)
 }
 
 void
-PluginsManager::recursiveDependencesFallDown (Server* server, string name, HashMap<string, bool> remove, HashMap<string, list<string>*> dependsOn)
+PluginsManager::recursiveDependencesFallDown (Server* server, string &name, HashMap<string, bool> &remove, HashMap<string, list<string>*> &dependsOn)
 {
   remove.put (name, true);
   list<string>* dependsList = dependsOn.get (name);
@@ -457,7 +474,7 @@ PluginsManager::recursiveDependencesFallDown (Server* server, string name, HashM
     {
 
       string logBuf;
-      logBuf.append ("PLUGINS MANAGER<DependencesCheck>: missing dependence: ");
+      logBuf.append ("Missing plugin dependence: ");
       logBuf.append (*lit);
       logBuf.append (" --> ");
       logBuf.append (name);
@@ -501,7 +518,7 @@ PluginsManager::load (Server *server)
       if (msVersion < pinfo->getMyServerMinVersion () || msVersion > pinfo->getMyServerMaxVersion ())
         {
           string logBuf;
-          logBuf.append ("PLUGINS MANAGER<VersionsCheck>: ");
+          logBuf.append ("Plugin ");
           logBuf.append (name);
           logBuf.append (" not compatible with this myserver version! ");
           server->logWriteln (logBuf.c_str (), MYSERVER_LOG_MSG_WARNING);
@@ -565,7 +582,7 @@ PluginsManager::load (Server *server)
           PluginInfo* dep = getPluginInfo (depN);
           if (!dep || remove.get (depN))
             {
-              logBuf.append ("PLUGINS MANAGER<DependencesCheck>: missing dependence: ");
+              logBuf.append ("Missing plugin dependence: ");
               logBuf.append (dname);
               logBuf.append (" --> ");
               logBuf.append (depN);
@@ -578,7 +595,7 @@ PluginsManager::load (Server *server)
           pair<int, int>* pdep = *lit;
           if (dep->getVersion () < pdep->first || dep->getVersion () > pdep->second)
             {
-              logBuf.append ("PLUGINS MANAGER<VersionsCheck>: plugin version not compatible: ");
+              logBuf.append ("Plugin version not compatible: ");
               logBuf.append (dname);
               logBuf.append (" --> ");
               logBuf.append (depN);
@@ -618,7 +635,7 @@ PluginsManager::postLoad (Server *server, XmlParser* languageFile)
         {
           plugin->postLoad (server, languageFile);
           string logBuf;
-          logBuf.append ("PLUGINS MANAGER: plugin ");
+          logBuf.append ("Plugin ");
           logBuf.append ((*it)->getName ());
           logBuf.append (" loaded! ");
           server->logWriteln (logBuf.c_str (), MYSERVER_LOG_MSG_INFO);

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/plugin/plugins_manager.h |    2 +-
 myserver/src/plugin/plugins_manager.cpp   |   99 +++++++++++++++++------------
 2 files changed, 59 insertions(+), 42 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu Jul 16 17:26:57 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MRYTh-0007gJ-1t
	for mharc-myserver-commit@gnu.org; Thu, 16 Jul 2009 17:26:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MRYTf-0007fj-6W
	for myserver-commit@gnu.org; Thu, 16 Jul 2009 17:26:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MRYTc-0007e9-8Z
	for myserver-commit@gnu.org; Thu, 16 Jul 2009 17:26:52 -0400
Received: from [199.232.76.173] (port=60782 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MRYTb-0007dz-RB
	for myserver-commit@gnu.org; Thu, 16 Jul 2009 17:26:52 -0400
Received: from savannah.gnu.org ([199.232.41.3]:49138 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 1MRYTZ-00076b-QF
	for myserver-commit@gnu.org; Thu, 16 Jul 2009 17:26:50 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MRYTY-0003Pt-O5
	for myserver-commit@gnu.org; Thu, 16 Jul 2009 21:26:48 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MRYTW-0003OP-Ik
	for myserver-commit@gnu.org; Thu, 16 Jul 2009 21:26:48 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 205cc0f5386bee92fb0e215287bdafd316549c90
X-Git-Newrev: 7f0c89b9f11c75439d20a0a36d6cb5cae34d9365
Message-Id: <E1MRYTW-0003OP-Ik@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 16 Jul 2009 21:26:47 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 7f0c89b9f11c75439d20a0a36d6cb5cae34d9365
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, 16 Jul 2009 21:26:55 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  7f0c89b9f11c75439d20a0a36d6cb5cae34d9365 (commit)
       via  adcbc7097542096778e83efc13c9bc4107eb3fa1 (commit)
       via  50f1b53c6839600fca479a2eaa69532f57df9968 (commit)
       via  a5d9bd05cc02128377e7e0c5fadded2a049135b3 (commit)
      from  205cc0f5386bee92fb0e215287bdafd316549c90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 7f0c89b9f11c75439d20a0a36d6cb5cae34d9365
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 16 23:15:28 2009 +0200

    Last things for 0.9-rc1.

diff --git a/misc/wingen/NSIS installer script.nsi b/misc/wingen/NSIS installer script.nsi
index de5397d..84d196e 100644
--- a/misc/wingen/NSIS installer script.nsi	
+++ b/misc/wingen/NSIS installer script.nsi	
@@ -14,11 +14,11 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments"            "www.gnu.org/softwar
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName"         "Free Software Foundation Inc."
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright"      "GNU MyServer"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription"     "GNU MyServer webserver"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"         "0.9.0.3"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion"      "0.9.0.3"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"         "0.9.0.1"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion"      "0.9.0.1"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "InternalName"        ""
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks"    ""
-VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename"    "MyServer-win32-0.9.0.exe"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename"    "MyServer-win32-0.9-rc1.exe"
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "PrivateBuild"       "1"
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "SpecialBuild"       "1"
 
@@ -127,61 +127,61 @@ InstallDirRegKey HKLM "Software\MyServer" ""
 
 
 ; Available Languages
-LicenseLangString MUILicense ${LANG_ENGLISH} "license.txt"			;DEFAULT LANGUAGE
-LicenseLangString MUILicense ${LANG_AFRIKAANS} "license.txt"
-LicenseLangString MUILicense ${LANG_ALBANIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_ARABIC} "license.txt"
-LicenseLangString MUILicense ${LANG_BASQUE} "license.txt"
-LicenseLangString MUILicense ${LANG_BELARUSIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_BOSNIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_BRETON} "license.txt"
-LicenseLangString MUILicense ${LANG_BULGARIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_CROATIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_CZECH} "license.txt"
-LicenseLangString MUILicense ${LANG_DANISH} "license.txt"
-LicenseLangString MUILicense ${LANG_DUTCH} "license.txt"
-LicenseLangString MUILicense ${LANG_ESTONIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_FARSI} "license.txt"
-LicenseLangString MUILicense ${LANG_FINNISH} "license.txt"
-LicenseLangString MUILicense ${LANG_FRENCH} "license.txt"
-LicenseLangString MUILicense ${LANG_GALICIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_GERMAN} "license.txt"
-LicenseLangString MUILicense ${LANG_GREEK} "license.txt"
-LicenseLangString MUILicense ${LANG_HEBREW} "license.txt"
-LicenseLangString MUILicense ${LANG_HUNGARIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_ICELANDIC} "license.txt"
-LicenseLangString MUILicense ${LANG_INDONESIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_IRISH} "license.txt"
-LicenseLangString MUILicense ${LANG_ITALIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_JAPANESE} "license.txt"
-LicenseLangString MUILicense ${LANG_KOREAN} "license.txt"
-LicenseLangString MUILicense ${LANG_KURDISH} "license.txt"
-LicenseLangString MUILicense ${LANG_LATVIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_LITHUANIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_LUXEMBOURGISH} "license.txt"
-LicenseLangString MUILicense ${LANG_MACEDONIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_MALAY} "license.txt"
-LicenseLangString MUILicense ${LANG_MONGOLIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_NORWEGIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_NORWEGIANNYNORSK} "license.txt"
-LicenseLangString MUILicense ${LANG_POLISH} "license.txt"
-LicenseLangString MUILicense ${LANG_PORTUGUESE} "license.txt"
-LicenseLangString MUILicense ${LANG_PORTUGUESEBR} "license.txt"
-LicenseLangString MUILicense ${LANG_ROMANIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_RUSSIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_SERBIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_SERBIANLATIN} "license.txt"
-LicenseLangString MUILicense ${LANG_SIMPCHINESE} "license.txt"
-LicenseLangString MUILicense ${LANG_SLOVAK} "license.txt"
-LicenseLangString MUILicense ${LANG_SLOVENIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_SPANISH} "license.txt"
-LicenseLangString MUILicense ${LANG_SWEDISH} "license.txt"
-LicenseLangString MUILicense ${LANG_THAI} "license.txt"
-LicenseLangString MUILicense ${LANG_TRADCHINESE} "license.txt"
-LicenseLangString MUILicense ${LANG_TURKISH} "license.txt"
-LicenseLangString MUILicense ${LANG_UKRAINIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_UZBEK} "license.txt"
-LicenseLangString MUILicense ${LANG_WELSH} "license.txt"
+LicenseLangString MUILicense ${LANG_ENGLISH} "COPYING"			;DEFAULT LANGUAGE
+LicenseLangString MUILicense ${LANG_AFRIKAANS} "COPYING"
+LicenseLangString MUILicense ${LANG_ALBANIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_ARABIC} "COPYING"
+LicenseLangString MUILicense ${LANG_BASQUE} "COPYING"
+LicenseLangString MUILicense ${LANG_BELARUSIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_BOSNIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_BRETON} "COPYING"
+LicenseLangString MUILicense ${LANG_BULGARIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_CROATIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_CZECH} "COPYING"
+LicenseLangString MUILicense ${LANG_DANISH} "COPYING"
+LicenseLangString MUILicense ${LANG_DUTCH} "COPYING"
+LicenseLangString MUILicense ${LANG_ESTONIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_FARSI} "COPYING"
+LicenseLangString MUILicense ${LANG_FINNISH} "COPYING"
+LicenseLangString MUILicense ${LANG_FRENCH} "COPYING"
+LicenseLangString MUILicense ${LANG_GALICIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_GERMAN} "COPYING"
+LicenseLangString MUILicense ${LANG_GREEK} "COPYING"
+LicenseLangString MUILicense ${LANG_HEBREW} "COPYING"
+LicenseLangString MUILicense ${LANG_HUNGARIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_ICELANDIC} "COPYING"
+LicenseLangString MUILicense ${LANG_INDONESIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_IRISH} "COPYING"
+LicenseLangString MUILicense ${LANG_ITALIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_JAPANESE} "COPYING"
+LicenseLangString MUILicense ${LANG_KOREAN} "COPYING"
+LicenseLangString MUILicense ${LANG_KURDISH} "COPYING"
+LicenseLangString MUILicense ${LANG_LATVIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_LITHUANIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_LUXEMBOURGISH} "COPYING"
+LicenseLangString MUILicense ${LANG_MACEDONIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_MALAY} "COPYING"
+LicenseLangString MUILicense ${LANG_MONGOLIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_NORWEGIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_NORWEGIANNYNORSK} "COPYING"
+LicenseLangString MUILicense ${LANG_POLISH} "COPYING"
+LicenseLangString MUILicense ${LANG_PORTUGUESE} "COPYING"
+LicenseLangString MUILicense ${LANG_PORTUGUESEBR} "COPYING"
+LicenseLangString MUILicense ${LANG_ROMANIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_RUSSIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_SERBIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_SERBIANLATIN} "COPYING"
+LicenseLangString MUILicense ${LANG_SIMPCHINESE} "COPYING"
+LicenseLangString MUILicense ${LANG_SLOVAK} "COPYING"
+LicenseLangString MUILicense ${LANG_SLOVENIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_SPANISH} "COPYING"
+LicenseLangString MUILicense ${LANG_SWEDISH} "COPYING"
+LicenseLangString MUILicense ${LANG_THAI} "COPYING"
+LicenseLangString MUILicense ${LANG_TRADCHINESE} "COPYING"
+LicenseLangString MUILicense ${LANG_TURKISH} "COPYING"
+LicenseLangString MUILicense ${LANG_UKRAINIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_UZBEK} "COPYING"
+LicenseLangString MUILicense ${LANG_WELSH} "COPYING"
 
 ; reserves the files: speeds up installer
 !insertmacro MUI_RESERVEFILE_LANGDLL
@@ -191,18 +191,17 @@ Section "MyServer core" SecCore
   SetOutPath $INSTDIR
   WriteUninstaller "uninstall.exe"
   File "myserver.exe"
-  File  "*.dll"
-  File "MIMEtypes.default.windows.xml"
-  File "myserver.default.windows.xml"
-  File "virtualhosts.default.windows.xml"
-  File "../README"
-  File "../COPYING"
+  File "MIMEtypes.xml"
+  File "myserver.xml"
+  File "virtualhosts.xml"
+  File "README"
+  File "COPYING"
   CreateDirectory "$INSTDIR\logs"
   SetOutPath $INSTDIR\web
   File "web\*.html"
   File "web\*.png"
   SetOutPath $INSTDIR\system
-  File "system\security"
+  File "system\.security.xml"
   SetOutPath $INSTDIR\system\css
   File "system\css\*.css"
   SetOutPath $INSTDIR\system\errors
@@ -244,21 +243,21 @@ SectionEnd
 Section "Web examples" SecWebEx
   SetOutPath "$INSTDIR\web\cgi-bin"
   File "web\cgi-bin\*.html"
-  File "web\cgi-bin\*.mscgi"
+  File /nonfatal "web\cgi-bin\*.mscgi"
 ; COPY SOURCE CODE
 ;  SetOutPath $INSTDIR\web\cgi-src\math_sum
 ;  File "web\cgi-src\math_sum\*.*"
 ;  SetOutPath "$INSTDIR\web\cgi-src\post"
 ;  File "web\cgi-src\post\*.*"
   SetOutPath "$INSTDIR\web\downloads"
-  File "web\downloads\*.php"
-  File "web\downloads\*.txt"
-  File "web\downloads\*.sh"
+  File /nonfatal "web\downloads\*.php"
+  File /nonfatal "web\downloads\*.txt"
+  File /nonfatal "web\downloads\*.sh"
 SectionEnd
 
 Section "Documentation" SecDocumentation
   SetOutPath "$INSTDIR\web\documentation"
-  File "..\documentation\myserver.html\*"
+  File /nonfatal "..\documentation\myserver.html\*"
 SectionEnd
 
 Section "Install other languages" SecLanguages
@@ -328,14 +327,13 @@ Section "Uninstall"
   Delete "$INSTDIR\languages\*.*"
   Delete "$INSTDIR\logs\*.*"
   Delete "$INSTDIR\*.exe"
-  Delete "$INSTDIR\*.dll"
   Delete "$INSTDIR\*.ico"
   Delete "$INSTDIR\*.txt"  
   Delete "$INSTDIR\documentation\*.*"
   Delete "$INSTDIR\documentation\images\*.*"
   RMDir "$INSTDIR\documentation"
   RMDir "$INSTDIR\images"
-; REMOVE ALL THE WEB AND CONFIGURATION FILES
+;;;;;;;;;;; REMOVE ALL THE WEB AND CONFIGURATION FILES
 ;  Delete "$INSTDIR\web\*.*"
 ;  Delete "$INSTDIR\web\cgi-bin\*.*"
 ;  Delete "$INSTDIR\web\cgi-src\math_sum\*.*"
@@ -367,11 +365,9 @@ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MyServer"
 
 SectionEnd
 
-
 ; Uninstaller Functions
 
 ;Function un.onInit
 ;  select language during uninstall
 ;  !insertmacro MUI_UNGETLANGUAGE
-  
 ;FunctionEnd
diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index 93af3d9..afc027e 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = languages logs system web certificates plugins
 
-EXTRA_DIST = myserver-daemon myserver.ico license.txt MIMEtypes.xml.unix.default \
-myserver.xml.unix.default readme.txt virtualhosts.xml.unix.default
+EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
+						 virtualhosts.default.xml
 
 configdir = $(root_prefix)/etc/myserver
 
diff --git a/myserver/src/base/Makefile.am b/myserver/src/base/Makefile.am
index 467891f..81a6fb7 100644
--- a/myserver/src/base/Makefile.am
+++ b/myserver/src/base/Makefile.am
@@ -1,5 +1,5 @@
 lib_LIBRARIES = libbase.a
 libbase_a_SOURCES = utility.cpp
-SUBDIRS = base64 bitvec dynamic_lib file files_cache find_data hash_map home_dir md5 mem_buff multicast pipe process regex safetime socket socket_pair ssl string sync thread xml unix_socket
+SUBDIRS = base64 bitvec dynamic_lib file files_cache find_data hash_map home_dir md5 mem_buff multicast pipe process regex safetime slab socket socket_pair ssl string sync thread xml unix_socket
 INCLUDES = $(all_includes)
 



commit adcbc7097542096778e83efc13c9bc4107eb3fa1
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 16 21:51:25 2009 +0200

    Fixed some possible memory leaks.

diff --git a/myserver/src/plugin/plugins_manager.cpp b/myserver/src/plugin/plugins_manager.cpp
index e00fef1..7e238bb 100755
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -24,6 +24,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <list>
 #include <string>
 
+extern "C"
+{
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+}
+
 using namespace std;
 
 /*!
@@ -98,17 +107,15 @@ PluginsManager::loadOptions (Server *server)
       if (node->getAttr (enabledKey))
         enabled = stringcmpi (*node->getAttr (enabledKey), "YES") == 0;
 
-      if (!plugin.length ())
+      if (plugin.length ())
+        addPluginInfo (plugin, new PluginInfo (plugin, enabled, global));
+      else
         {
           string error;
           error.assign ("Invalid plugin name in PLUGIN block.");
           server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_WARNING);
           ret = -1;
         }
-      else
-        {
-          addPluginInfo (plugin, new PluginInfo (plugin, enabled, global));
-        }
     }
 
   return ret;
@@ -284,9 +291,12 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
 
   if (xmlHasProp (nodes->nodeTab[0], (const xmlChar*) "min-version"))
     {
-      char* mSMinVersion = (char*) xmlGetProp (nodes->nodeTab[0], (const xmlChar*) "min-version");
-      pinfo->setMyServerMinVersion (PluginInfo::convertVersion (new string (mSMinVersion)));
-      xmlFree (mSMinVersion);
+      xmlChar *minVersion = xmlGetProp (nodes->nodeTab[0],
+                                        (const xmlChar*) "min-version");
+
+      string sMinVer ((char*)minVersion);
+      pinfo->setMyServerMinVersion (PluginInfo::convertVersion (&sMinVer));
+      xmlMemFree ((void*)minVersion);
     }
   else
     {
@@ -302,9 +312,12 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
 
   if (xmlHasProp (nodes->nodeTab[0], (const xmlChar*) "max-version"))
     {
-      char* mSMaxVersion = (char*) xmlGetProp (nodes->nodeTab[0], (const xmlChar*) "max-version");
-      pinfo->setMyServerMaxVersion (PluginInfo::convertVersion (new string (mSMaxVersion)));
-      xmlFree (mSMaxVersion);
+      xmlChar* maxVersion = xmlGetProp (nodes->nodeTab[0],
+                                        (const xmlChar*) "max-version");
+
+      string sMaxVer ((char*)maxVersion);
+      pinfo->setMyServerMaxVersion (PluginInfo::convertVersion (&sMaxVer));
+      xmlMemFree ((void*)maxVersion);
     }
   else
     {
@@ -313,16 +326,16 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
-  xmlFree (xpathRes);
+  delete xpathRes;
 
   xpathRes = xml.evaluateXpath ("/PLUGIN/NAME/text()");
   nodes = xpathRes->getNodeSet ();
   size = (nodes) ? nodes->nodeNr : 0;
 
-
   if (size != 1)
     {
       string error;
@@ -330,6 +343,7 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
@@ -337,16 +351,17 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
 
 
   if (strcmp (name.c_str (), cname))
-    return NULL;
+    {
+      delete xpathRes;
+      return NULL;
+    }
 
-  xmlFree (xpathRes);
+  delete xpathRes;
 
   xpathRes = xml.evaluateXpath ("/PLUGIN/VERSION/text()");
   nodes = xpathRes->getNodeSet ();
   size = (nodes) ? nodes->nodeNr : 0;
 
-
-
   if (size != 1)
     {
       string error;
@@ -354,11 +369,13 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
 
   int version = PluginInfo::convertVersion (new string ((char*) nodes->nodeTab[0]->content));
+
   if (version!=-1)
     pinfo->setVersion (version);
   else
@@ -368,6 +385,7 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
@@ -384,7 +402,8 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
 
       string nameDep (depends);
 
-      if (!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "min-version") || !xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "max-version"))
+      if (!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "min-version") ||
+          !xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "max-version"))
         {
           string error;
           error.append ("Unable to load plugin ");
@@ -394,24 +413,27 @@ PluginsManager::loadInfo (Server* server, string& name, string& path)
           return NULL;
         }
 
-      int minVersion = PluginInfo::convertVersion (new string ((char*) xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "min-version")));
+      int minVersion = PluginInfo::convertVersion (new string ((char*) xmlGetProp (nodes->nodeTab[i],
+                                                                                   (const xmlChar*) "min-version")));
 
-      int maxVersion = PluginInfo::convertVersion (new string ((char*) xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "max-version")));
+      int maxVersion = PluginInfo::convertVersion (new string ((char*) xmlGetProp (nodes->nodeTab[i],
+                                                                                   (const xmlChar*) "max-version")));
 
       if (minVersion == -1 || maxVersion == -1)
-                {
+        {
           string error;
           error.append ("Unable to load plugin ");
           error.append (name);
           error.append (", bad plugin.xml format.");
           server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+          delete xpathRes;
           return NULL;
         }
 
       pinfo->addDependence (nameDep, minVersion, maxVersion);
     }
 
-  xmlFree (xpathRes);
+  delete xpathRes;
 
   return pinfo;
 }



commit 50f1b53c6839600fca479a2eaa69532f57df9968
Merge: a5d9bd0 205cc0f
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 16 21:09:57 2009 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver




commit a5d9bd05cc02128377e7e0c5fadded2a049135b3
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 16 20:54:39 2009 +0200

    Version bump.

diff --git a/myserver/version b/myserver/version
index 984acb4..1a7ab56 100644
--- a/myserver/version
+++ b/myserver/version
@@ -1 +1 @@
-0.9.0-rc2
\ No newline at end of file
+0.9.0-rc1
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 misc/wingen/NSIS installer script.nsi   |  144 +++++++++++++++----------------
 myserver/binaries/Makefile.am           |    4 +-
 myserver/src/base/Makefile.am           |    2 +-
 myserver/src/plugin/plugins_manager.cpp |   66 ++++++++++-----
 myserver/version                        |    2 +-
 5 files changed, 118 insertions(+), 100 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sat Jul 18 14:52:35 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MSF1O-0001X7-Vn
	for mharc-myserver-commit@gnu.org; Sat, 18 Jul 2009 14:52:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MSF1M-0001TW-Sg
	for myserver-commit@gnu.org; Sat, 18 Jul 2009 14:52:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MSF1L-0001Qd-FZ
	for myserver-commit@gnu.org; Sat, 18 Jul 2009 14:52:31 -0400
Received: from [199.232.76.173] (port=44543 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MSF1L-0001PY-1C
	for myserver-commit@gnu.org; Sat, 18 Jul 2009 14:52:31 -0400
Received: from savannah.gnu.org ([199.232.41.3]:53337 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 1MSF1J-0003GV-O6
	for myserver-commit@gnu.org; Sat, 18 Jul 2009 14:52:29 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MSF1I-0003Kj-PQ
	for myserver-commit@gnu.org; Sat, 18 Jul 2009 18:52:28 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MSF1G-0003JN-66
	for myserver-commit@gnu.org; Sat, 18 Jul 2009 18:52:28 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7f0c89b9f11c75439d20a0a36d6cb5cae34d9365
X-Git-Newrev: 2ada0449424827d1a1a445cd4578c0ae49a6a738
Message-Id: <E1MSF1G-0003JN-66@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 18 Jul 2009 18:52:27 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 2ada0449424827d1a1a445cd4578c0ae49a6a738
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, 18 Jul 2009 18:52:33 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  2ada0449424827d1a1a445cd4578c0ae49a6a738 (commit)
       via  fc8a8e2b6f14b287622965e6ae7ec6434cdb3f6e (commit)
      from  7f0c89b9f11c75439d20a0a36d6cb5cae34d9365 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 2ada0449424827d1a1a445cd4578c0ae49a6a738
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Jul 18 20:52:25 2009 +0200

    Install the correct configuration files.

diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index afc027e..3fdce61 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -6,6 +6,6 @@ EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
 configdir = $(root_prefix)/etc/myserver
 
 install: install-recursive
-	$(install_sh_DATA) MIMEtypes.xml.unix.default $(configdir)/MIMEtypes.xml
-	$(install_sh_DATA) myserver.xml.unix.default $(configdir)/myserver.xml
-	$(install_sh_DATA) virtualhosts.xml.unix.default $(configdir)/virtualhosts.xml
+	$(install_sh_DATA) MIMEtypes.default.xml $(configdir)/MIMEtypes.xml
+	$(install_sh_DATA) myserver.default.xml $(configdir)/myserver.xml
+	$(install_sh_DATA) virtualhosts.default.xml $(configdir)/virtualhosts.xml



commit fc8a8e2b6f14b287622965e6ae7ec6434cdb3f6e
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Jul 18 20:51:46 2009 +0200

    Do not handle the PIDFILE by the `start-stop-daemon' helper.

diff --git a/myserver/binaries/myserver-daemon b/myserver/binaries/myserver-daemon
index 1abd58d..e1a8089 100644
--- a/myserver/binaries/myserver-daemon
+++ b/myserver/binaries/myserver-daemon
@@ -39,23 +39,25 @@ test -x $DAEMON || exit 0
 
 d_start()
 {
-	start-stop-daemon --start --pidfile $PIDFILE \
-	--exec $DAEMON -- -rSERVICE --log="file://$LOGFILE" --pidfile=$PIDFILE
+	start-stop-daemon --start --exec $DAEMON -- -rSERVICE \
+  --log="file://$LOGFILE" --pidfile=$PIDFILE
 }
 
 
 d_stop()
 {
-	start-stop-daemon --stop --pidfile $PIDFILE \
-	--exec $DAEMON -- -rSERVICE --log="file://$LOGFILE" --pidfile=$PIDFILE
-
+  if test -e $PIDFILE; then
+	  start-stop-daemon --stop --exec $DAEMON -- -rSERVICE \
+  --log="file://$LOGFILE" --pidfile=$PIDFILE;
+    rm -f $PIDFILE;
+  fi
 }
 
 
 d_reload()
 {
-	start-stop-daemon --stop  --signal 1  --pidfile $PIDFILE \
-	--exec $DAEMON -- -rSERVICE --log="file://$LOGFILE" --pidfile=$PIDFILE
+	start-stop-daemon --stop  --signal 1  --exec $DAEMON -- -rSERVICE \
+  --log="file://$LOGFILE" --pidfile=$PIDFILE
 }
 
 d_restart()

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/Makefile.am     |    6 +++---
 myserver/binaries/myserver-daemon |   16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun Jul 19 14:47:46 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MSbQI-0000rJ-2k
	for mharc-myserver-commit@gnu.org; Sun, 19 Jul 2009 14:47:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MSbQG-0000on-E9
	for myserver-commit@gnu.org; Sun, 19 Jul 2009 14:47:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MSbQF-0000mh-Af
	for myserver-commit@gnu.org; Sun, 19 Jul 2009 14:47:43 -0400
Received: from [199.232.76.173] (port=54724 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MSbQF-0000mC-4Z
	for myserver-commit@gnu.org; Sun, 19 Jul 2009 14:47:43 -0400
Received: from savannah.gnu.org ([199.232.41.3]:50764 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 1MSbQE-0006ft-Ew
	for myserver-commit@gnu.org; Sun, 19 Jul 2009 14:47:42 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MSbQD-0002Ey-TM
	for myserver-commit@gnu.org; Sun, 19 Jul 2009 18:47:41 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MSbQB-0002CV-9O
	for myserver-commit@gnu.org; Sun, 19 Jul 2009 18:47:41 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2ada0449424827d1a1a445cd4578c0ae49a6a738
X-Git-Newrev: b1b88f01adff53a3d7dd78d8ccc1cc6459410291
Message-Id: <E1MSbQB-0002CV-9O@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 19 Jul 2009 18:47:40 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. b1b88f01adff53a3d7dd78d8ccc1cc6459410291
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, 19 Jul 2009 18:47:44 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  b1b88f01adff53a3d7dd78d8ccc1cc6459410291 (commit)
       via  8dd889cda728730411151df0297fe1611f603cbc (commit)
      from  2ada0449424827d1a1a445cd4578c0ae49a6a738 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit b1b88f01adff53a3d7dd78d8ccc1cc6459410291
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 19 20:41:33 2009 +0200

    Do not install static temporary libraries.

diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index 3fdce61..f4603c6 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = languages logs system web certificates plugins
 EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
 						 virtualhosts.default.xml
 
-configdir = $(root_prefix)/etc/myserver
+configdir = $(DESTDIR)/etc/myserver
 
 install: install-recursive
 	$(install_sh_DATA) MIMEtypes.default.xml $(configdir)/MIMEtypes.xml
diff --git a/myserver/binaries/certificates/Makefile.am b/myserver/binaries/certificates/Makefile.am
index d98e7b2..69501f5 100644
--- a/myserver/binaries/certificates/Makefile.am
+++ b/myserver/binaries/certificates/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = how_create_certificates.txt
 install :
-	$(INSTALL) -d '$(root_prefix)/etc/myserver/certificates'
-	$(INSTALL) 'how_create_certificates.txt' '$(root_prefix)/etc/myserver/certificates/how_create_certificates.txt'
+	$(INSTALL) -d '$(DESTDIR)/etc/myserver/certificates'
+	$(INSTALL) 'how_create_certificates.txt' '$(DESTDIR)/etc/myserver/certificates/how_create_certificates.txt'
diff --git a/myserver/binaries/logs/Makefile.am b/myserver/binaries/logs/Makefile.am
index cb7874b..1bc56a5 100644
--- a/myserver/binaries/logs/Makefile.am
+++ b/myserver/binaries/logs/Makefile.am
@@ -1,3 +1,2 @@
 install :
-	$(INSTALL) -d $(root_prefix)/var/log/myserver
-
+	$(INSTALL) -d $(DESTDIR)/var/log/myserver
diff --git a/myserver/binaries/web/Makefile.am b/myserver/binaries/web/Makefile.am
index 900ccc5..b2e9ad6 100644
--- a/myserver/binaries/web/Makefile.am
+++ b/myserver/binaries/web/Makefile.am
@@ -1,9 +1,9 @@
 if BUILD_MSCGI
-CGI_SRC = cgi-src
+	CGI_SRC = cgi-src
 endif
 
 SUBDIRS = cgi-bin $(CGI_SRC) downloads
 
-myserverdatadir = $(root_prefix)/var/web
+myserverdatadir = $(DESTDIR)/var/web
 
 dist_myserverdata_DATA = logo.png goto.png default.html link.html
diff --git a/myserver/binaries/web/cgi-bin/Makefile.am b/myserver/binaries/web/cgi-bin/Makefile.am
index 559e6af..9eca560 100644
--- a/myserver/binaries/web/cgi-bin/Makefile.am
+++ b/myserver/binaries/web/cgi-bin/Makefile.am
@@ -1,4 +1,4 @@
-myserverdatadir = $(root_prefix)/var/web/cgi-bin
+myserverdatadir = $(DESTDIR)/var/web/cgi-bin
 
 dist_myserverdata_DATA = counter.html default.html counter.readme
 
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index 5d42b8b..bc8f1a6 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -12,7 +12,7 @@ math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
 	$(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a $(libmath_sum_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
 
 install : math_sum.mscgi
-	$(INSTALL) -D 'math_sum.mscgi' '$(root_prefix)/var/web/cgi-bin/math_sum.mscgi'
+	$(INSTALL) -D 'math_sum.mscgi' '$(DESTDIR)/var/web/cgi-bin/math_sum.mscgi'
 
 
 clean :
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am b/myserver/binaries/web/cgi-src/post/Makefile.am
index 1561e25..301c2f8 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -13,7 +13,7 @@ post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
 	$(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a $(libpost_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o post.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
 
 install : post.mscgi
-	$(INSTALL) -D 'post.mscgi' '$(root_prefix)/var/web/cgi-bin/post.mscgi'
+	$(INSTALL) -D 'post.mscgi' '$(DESTDIR)/var/web/cgi-bin/post.mscgi'
 
 clean :
 	rm -f post.mscgi
diff --git a/myserver/binaries/web/downloads/Makefile.am b/myserver/binaries/web/downloads/Makefile.am
index 5ada5f4..f88e79d 100644
--- a/myserver/binaries/web/downloads/Makefile.am
+++ b/myserver/binaries/web/downloads/Makefile.am
@@ -1,5 +1,4 @@
-
-myserverdatadir = $(root_prefix)/var/web/downloads
+myserverdatadir = $(DESTDIR)/var/web/downloads
 
 dist_myserverdata_DATA = hello.php script.sh file1.txt file2.txt
 
diff --git a/myserver/configure.in b/myserver/configure.in
index 0ae2208..001a09a 100644
--- a/myserver/configure.in
+++ b/myserver/configure.in
@@ -60,18 +60,7 @@ CFLAGS="$CFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 CXXFLAGS="$CXXFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 LDFLAGS="$LDFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 
-AC_ARG_WITH([root-prefix], [  --with-root-prefix=PREFIX override prefix variable for files to be placed in the root], root_prefix=$withval, root_prefix="\$(DESTDIR)")
-
-AC_ARG_ENABLE([ipv6], [  --enable-ipv6 Build with IPv6 support], enable_ipv6="yes", enable_ipv6="")
-
-root_bindir='${root_prefix}/bin'
-root_sbindir='${root_prefix}/sbin'
-root_sysconfdir='${root_prefix}/etc'
-
-AC_SUBST(root_prefix)
-AC_SUBST(root_bindir)
-AC_SUBST(root_sbindir)
-AC_SUBST(root_sysconfdir)
+AC_ARG_ENABLE([ipv6], [--enable-ipv6 Build with IPv6 support], enable_ipv6="yes", enable_ipv6="")
 
 dnl Looking for argp.h
 AC_CHECK_HEADER([argp.h], AC_DEFINE(ARGP, 1, [Define if GNU argp tools are available]))
@@ -145,9 +134,8 @@ esac
 
 AC_SUBST(DL_LIB)
 
-
 if test x$PTHREAD_LIB != x; then
-   AC_DEFINE(HAVE_PTHREAD, 1, [POSIX threads required for MyServer in a non-windows environment])
+   AC_DEFINE(HAVE_PTHREAD, 1, [POSIX threads])
 fi
 
 dnl See if we need -lxnet for arpa
@@ -319,7 +307,6 @@ AC_TYPE_UID_T
 AC_TYPE_GETGROUPS
 
 AM_CONDITIONAL(BUILD_TESTS, test "$MAKE_TESTS" = "yes")
-
 AM_CONDITIONAL(BUILD_MSCGI, test "$MAKE_MSCGI" = "yes")
 AM_CONDITIONAL(BUILD_DOC, test "$MAKE_DOC" = "yes")
 
diff --git a/myserver/include/Makefile.am b/myserver/include/Makefile.am
index 2c51c28..7adb216 100644
--- a/myserver/include/Makefile.am
+++ b/myserver/include/Makefile.am
@@ -2,3 +2,5 @@ includeincludedir=$(includedir)/myserver/include/find_data
 includeinclude_HEADERS =
 SUBDIRS = base conf connection connections_scheduler filter http_handler log plugin protocol server
 
+install:
+# Do not do anything.
diff --git a/myserver/src/base/Makefile.am b/myserver/src/base/Makefile.am
index 81a6fb7..aa8e6f4 100644
--- a/myserver/src/base/Makefile.am
+++ b/myserver/src/base/Makefile.am
@@ -3,3 +3,5 @@ libbase_a_SOURCES = utility.cpp
 SUBDIRS = base64 bitvec dynamic_lib file files_cache find_data hash_map home_dir md5 mem_buff multicast pipe process regex safetime slab socket socket_pair ssl string sync thread xml unix_socket
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/conf/Makefile.am b/myserver/src/conf/Makefile.am
index 119d6f6..daf1b1e 100644
--- a/myserver/src/conf/Makefile.am
+++ b/myserver/src/conf/Makefile.am
@@ -2,3 +2,6 @@ lib_LIBRARIES = libconf.a
 libconf_a_SOURCES = nodetree.cpp xml_conf.cpp
 SUBDIRS = mime security vhost
 INCLUDES = $(all_includes)
+
+install:
+# Do not do anything.
diff --git a/myserver/src/connection/Makefile.am b/myserver/src/connection/Makefile.am
index 31b5d78..62368ae 100644
--- a/myserver/src/connection/Makefile.am
+++ b/myserver/src/connection/Makefile.am
@@ -3,3 +3,5 @@ libconnection_a_SOURCES = connection.cpp
 SUBDIRS =
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/connections_scheduler/Makefile.am b/myserver/src/connections_scheduler/Makefile.am
index 60a727c..5fde48a 100644
--- a/myserver/src/connections_scheduler/Makefile.am
+++ b/myserver/src/connections_scheduler/Makefile.am
@@ -3,3 +3,5 @@ libconnections_scheduler_a_SOURCES = connections_scheduler.cpp listen_threads.cp
 SUBDIRS =
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/filter/Makefile.am b/myserver/src/filter/Makefile.am
index b89a36d..f877709 100644
--- a/myserver/src/filter/Makefile.am
+++ b/myserver/src/filter/Makefile.am
@@ -4,3 +4,5 @@ libfilter_a_SOURCES = filter.cpp filters_chain.cpp filters_factory.cpp memory_st
 SUBDIRS = gzip
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/http_handler/Makefile.am b/myserver/src/http_handler/Makefile.am
index 156427b..88924f6 100644
--- a/myserver/src/http_handler/Makefile.am
+++ b/myserver/src/http_handler/Makefile.am
@@ -3,3 +3,5 @@ libhttp_handler_a_SOURCES =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi proxy scgi wincgi
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/log/Makefile.am b/myserver/src/log/Makefile.am
index 260b9e8..d151f4b 100644
--- a/myserver/src/log/Makefile.am
+++ b/myserver/src/log/Makefile.am
@@ -2,3 +2,6 @@ lib_LIBRARIES = liblog.a
 liblog_a_SOURCES = log_manager.cpp
 SUBDIRS = stream
 INCLUDES = $(all_includes)
+
+install:
+# Do not do anything.
diff --git a/myserver/src/plugin/Makefile.am b/myserver/src/plugin/Makefile.am
index c0bc45a..b14f28b 100644
--- a/myserver/src/plugin/Makefile.am
+++ b/myserver/src/plugin/Makefile.am
@@ -2,3 +2,5 @@ lib_LIBRARIES = libplugin.a
 libplugin_a_SOURCES =  plugin.cpp plugin_info.cpp plugins_manager.cpp 
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/protocol/Makefile.am b/myserver/src/protocol/Makefile.am
index 1d5a94f..6ff0348 100644
--- a/myserver/src/protocol/Makefile.am
+++ b/myserver/src/protocol/Makefile.am
@@ -3,3 +3,5 @@ libprotocol_a_SOURCES = protocol_buffer.cpp protocol.cpp protocols_manager.cpp u
 SUBDIRS = control ftp http https
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/server/Makefile.am b/myserver/src/server/Makefile.am
index 7c4041a..fba8cf5 100644
--- a/myserver/src/server/Makefile.am
+++ b/myserver/src/server/Makefile.am
@@ -3,3 +3,5 @@ libserver_a_SOURCES = clients_thread.cpp server.cpp
 SUBDIRS =
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.



commit 8dd889cda728730411151df0297fe1611f603cbc
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 19 17:41:05 2009 +0200

    Do not install the tests_suite program.

diff --git a/myserver/tests/Makefile.am b/myserver/tests/Makefile.am
index f410b98..b4b07a9 100644
--- a/myserver/tests/Makefile.am
+++ b/myserver/tests/Makefile.am
@@ -13,3 +13,6 @@ test_socket.cpp test_socket_pair.cpp test_socket_stream_creator.cpp test_ssl_soc
 test_url.cpp test_utility.cpp test_validator.cpp test_validator_factory.cpp test_xml.cpp test_xml_validator.cpp test_nodetree.cpp
 
 tests_suite_LDADD = ../src/libmyserver.a $(CPPUNIT_LDFLAGS) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS)
+
+
+install:

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/Makefile.am                      |    2 +-
 myserver/binaries/certificates/Makefile.am         |    4 ++--
 myserver/binaries/logs/Makefile.am                 |    3 +--
 myserver/binaries/web/Makefile.am                  |    4 ++--
 myserver/binaries/web/cgi-bin/Makefile.am          |    2 +-
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |    2 +-
 myserver/binaries/web/cgi-src/post/Makefile.am     |    2 +-
 myserver/binaries/web/downloads/Makefile.am        |    3 +--
 myserver/configure.in                              |   17 ++---------------
 myserver/include/Makefile.am                       |    2 ++
 myserver/src/base/Makefile.am                      |    2 ++
 myserver/src/conf/Makefile.am                      |    3 +++
 myserver/src/connection/Makefile.am                |    2 ++
 myserver/src/connections_scheduler/Makefile.am     |    2 ++
 myserver/src/filter/Makefile.am                    |    2 ++
 myserver/src/http_handler/Makefile.am              |    2 ++
 myserver/src/log/Makefile.am                       |    3 +++
 myserver/src/plugin/Makefile.am                    |    2 ++
 myserver/src/protocol/Makefile.am                  |    2 ++
 myserver/src/server/Makefile.am                    |    2 ++
 myserver/tests/Makefile.am                         |    3 +++
 21 files changed, 39 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed Jul 22 15:32:10 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MThXu-0007DT-Hb
	for mharc-myserver-commit@gnu.org; Wed, 22 Jul 2009 15:32:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MThXt-0007Cx-Ao
	for myserver-commit@gnu.org; Wed, 22 Jul 2009 15:32:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MThXs-0007CM-ET
	for myserver-commit@gnu.org; Wed, 22 Jul 2009 15:32:08 -0400
Received: from [199.232.76.173] (port=46711 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MThXs-0007CF-53
	for myserver-commit@gnu.org; Wed, 22 Jul 2009 15:32:08 -0400
Received: from savannah.gnu.org ([199.232.41.3]:35034 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 1MThXr-0003Lw-QK
	for myserver-commit@gnu.org; Wed, 22 Jul 2009 15:32:07 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MThXr-0003Bq-Co
	for myserver-commit@gnu.org; Wed, 22 Jul 2009 19:32:07 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MThXp-0003BN-0q
	for myserver-commit@gnu.org; Wed, 22 Jul 2009 19:32:07 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b1b88f01adff53a3d7dd78d8ccc1cc6459410291
X-Git-Newrev: e9c335399e11d7b0fe9006ae908bd3ad392cb20d
Message-Id: <E1MThXp-0003BN-0q@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 22 Jul 2009 19:32:06 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. e9c335399e11d7b0fe9006ae908bd3ad392cb20d
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: Wed, 22 Jul 2009 19:32:09 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  e9c335399e11d7b0fe9006ae908bd3ad392cb20d (commit)
      from  b1b88f01adff53a3d7dd78d8ccc1cc6459410291 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit e9c335399e11d7b0fe9006ae908bd3ad392cb20d
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 19 21:22:38 2009 +0200

    Compile MSCGI examples under Windows.

diff --git a/myserver/binaries/web/Makefile.am b/myserver/binaries/web/Makefile.am
index b2e9ad6..cf26f49 100644
--- a/myserver/binaries/web/Makefile.am
+++ b/myserver/binaries/web/Makefile.am
@@ -1,5 +1,6 @@
+
 if BUILD_MSCGI
-	CGI_SRC = cgi-src
+CGI_SRC = cgi-src
 endif
 
 SUBDIRS = cgi-bin $(CGI_SRC) downloads
diff --git a/myserver/configure.in b/myserver/configure.in
index 001a09a..92ac4e5 100644
--- a/myserver/configure.in
+++ b/myserver/configure.in
@@ -100,7 +100,8 @@ AC_CHECK_LIB(gcrypt, gcry_control, AC_DEFINE(GCRY_CONTROL, 1, [Define if the gcr
 
 case "${host}" in
     *-*-mingw32*)
-     LDFLAGS="$LDFLAGS -lwsock32 -lgdi32 -lole32  -luuid -luserenv"
+     LDFLAGS="-lwsock32 -lgdi32 -lole32  -luuid -luserenv $LDFLAGS"
+     MAKE_MSCGI=yes
      ;;
   *)
      dnl Looking for pthreads
@@ -124,7 +125,6 @@ case "${host}" in
                 *** MSCGI support will not function
                     ])
          DL_LIB=""
-         MAKE_MSCGI=no
    fi
 
 
@@ -310,6 +310,10 @@ AM_CONDITIONAL(BUILD_TESTS, test "$MAKE_TESTS" = "yes")
 AM_CONDITIONAL(BUILD_MSCGI, test "$MAKE_MSCGI" = "yes")
 AM_CONDITIONAL(BUILD_DOC, test "$MAKE_DOC" = "yes")
 
+AC_SUBST(BUILD_TESTS)
+AC_SUBST(BUILD_DOC)
+AC_SUBST(BUILD_MSCGI)
+
 dnl AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([
     Makefile
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index 730671c..2e93e63 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -23,13 +23,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 extern "C"
 {
 #if GCRY_CONTROL
-#include <errno.h>
-#include <gcrypt.h>
+
+# include <errno.h>
+
+# ifdef WIN32
+#  undef socklen_t
+# endif
+
+# include <gcrypt.h>
+
+# ifdef HAVE_PTHREAD
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+# endif
+
 #endif
 
 #ifdef HAVE_PTHREAD
-#include <pthread.h>
+# include <pthread.h>
 #endif
 }
 
@@ -99,7 +109,7 @@ void initializeSSL ()
 
   if (!initialized)
   {
-#if GCRY_CONTROL
+#if GCRY_CONTROL && HAVE_PTHREAD
     gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 #endif
     gnutls_global_init ();

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/web/Makefile.am |    3 ++-
 myserver/configure.in             |    8 ++++++--
 myserver/src/base/ssl/ssl.cpp     |   18 ++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu Jul 23 03:32:30 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MTsn0-00068F-4F
	for mharc-myserver-commit@gnu.org; Thu, 23 Jul 2009 03:32:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MTsmy-00067k-A2
	for myserver-commit@gnu.org; Thu, 23 Jul 2009 03:32:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MTsmx-00067L-9j
	for myserver-commit@gnu.org; Thu, 23 Jul 2009 03:32:27 -0400
Received: from [199.232.76.173] (port=39825 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MTsmw-000678-V4
	for myserver-commit@gnu.org; Thu, 23 Jul 2009 03:32:26 -0400
Received: from savannah.gnu.org ([199.232.41.3]:39894 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 1MTsmw-0004N4-6z
	for myserver-commit@gnu.org; Thu, 23 Jul 2009 03:32:26 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MTsmv-0000av-ES
	for myserver-commit@gnu.org; Thu, 23 Jul 2009 07:32:25 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MTsms-0000aM-Tl
	for myserver-commit@gnu.org; Thu, 23 Jul 2009 07:32:25 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e9c335399e11d7b0fe9006ae908bd3ad392cb20d
X-Git-Newrev: 814f9d55cf85b01a99eac4750262df1953273c65
Message-Id: <E1MTsms-0000aM-Tl@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 23 Jul 2009 07:32:24 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 814f9d55cf85b01a99eac4750262df1953273c65
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, 23 Jul 2009 07:32:28 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  814f9d55cf85b01a99eac4750262df1953273c65 (commit)
      from  e9c335399e11d7b0fe9006ae908bd3ad392cb20d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 814f9d55cf85b01a99eac4750262df1953273c65
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 23 09:30:05 2009 +0200

    The tests suite build can be disabled at configure time.

diff --git a/myserver/configure.in b/myserver/configure.in
index 92ac4e5..7f170d2 100644
--- a/myserver/configure.in
+++ b/myserver/configure.in
@@ -62,6 +62,9 @@ LDFLAGS="$LDFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 
 AC_ARG_ENABLE([ipv6], [--enable-ipv6 Build with IPv6 support], enable_ipv6="yes", enable_ipv6="")
 
+AC_ARG_ENABLE([tests], [--disable-tests Disable the tests suite],
+                       enable_tests="$enableval", enable_tests="yes")
+
 dnl Looking for argp.h
 AC_CHECK_HEADER([argp.h], AC_DEFINE(ARGP, 1, [Define if GNU argp tools are available]))
 
@@ -282,18 +285,24 @@ else
     AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
 fi
 
-dnl Looking for cppunit
-AM_PATH_CPPUNIT(1.12.0, have_cppunit=yes)
-if test x$have_cppunit != xyes; then
+
+
+if test x$enable_tests == xyes; then
+  dnl Looking for cppunit
+  AM_PATH_CPPUNIT(1.12.0, have_cppunit=yes)
+  if test x$have_cppunit != xyes; then
     AC_MSG_WARN([
-*** Cannot find CppUnit (http://cppunit.sourceforge.net/.)
-*** tests driver program will not be built
-])
+      *** Cannot find CppUnit (http://cppunit.sourceforge.net/.)
+      *** tests driver program will not be built
+    ])
     MAKE_TESTS=no
     CPPUNIT_LDFLAGS=""
-else
+  else
     MAKE_TESTS=yes
     CPPUNIT_LDFLAGS="-lcppunit"
+  fi
+else
+  MAKE_TESTS=no
 fi
 
 LDFLAGS="$LDFLAGS $LIBS"

-----------------------------------------------------------------------

Summary of changes:
 myserver/configure.in |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu Jul 30 14:02:04 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MWZx5-0007nN-VZ
	for mharc-myserver-commit@gnu.org; Thu, 30 Jul 2009 14:02:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MWZx4-0007n2-Ua
	for myserver-commit@gnu.org; Thu, 30 Jul 2009 14:02:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MWZx3-0007ma-15
	for myserver-commit@gnu.org; Thu, 30 Jul 2009 14:02:02 -0400
Received: from [199.232.76.173] (port=55784 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MWZx2-0007mR-TV
	for myserver-commit@gnu.org; Thu, 30 Jul 2009 14:02:00 -0400
Received: from savannah.gnu.org ([199.232.41.3]:53007 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 1MWZx2-0000Nv-CM
	for myserver-commit@gnu.org; Thu, 30 Jul 2009 14:02:00 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MWZx2-0001AI-0m
	for myserver-commit@gnu.org; Thu, 30 Jul 2009 18:02:00 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MWZwz-00019i-Dr
	for myserver-commit@gnu.org; Thu, 30 Jul 2009 18:01:59 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 814f9d55cf85b01a99eac4750262df1953273c65
X-Git-Newrev: 20fc8ae23b82d5d05b1bf79cea7511e9e04c57c6
Message-Id: <E1MWZwz-00019i-Dr@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 30 Jul 2009 18:01:58 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 20fc8ae23b82d5d05b1bf79cea7511e9e04c57c6
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, 30 Jul 2009 18:02:03 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  20fc8ae23b82d5d05b1bf79cea7511e9e04c57c6 (commit)
      from  814f9d55cf85b01a99eac4750262df1953273c65 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 20fc8ae23b82d5d05b1bf79cea7511e9e04c57c6
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 30 20:00:17 2009 +0200

    Bump new version.

diff --git a/myserver/version b/myserver/version
index 1a7ab56..984acb4 100644
--- a/myserver/version
+++ b/myserver/version
@@ -1 +1 @@
-0.9.0-rc1
\ No newline at end of file
+0.9.0-rc2
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 myserver/version |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Jul 31 18:30:34 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1MX0cU-0005vg-KO
	for mharc-myserver-commit@gnu.org; Fri, 31 Jul 2009 18:30:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MX0cT-0005tP-2A
	for myserver-commit@gnu.org; Fri, 31 Jul 2009 18:30:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MX0cR-0005sV-Lm
	for myserver-commit@gnu.org; Fri, 31 Jul 2009 18:30:32 -0400
Received: from [199.232.76.173] (port=42548 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MX0cR-0005sM-I5
	for myserver-commit@gnu.org; Fri, 31 Jul 2009 18:30:31 -0400
Received: from savannah.gnu.org ([199.232.41.3]:58287 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 1MX0cR-00030w-2T
	for myserver-commit@gnu.org; Fri, 31 Jul 2009 18:30:31 -0400
Received: from download.savannah.gnu.org ([199.232.41.75]
	helo=cvs.savannah.gnu.org) by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1MX0cQ-0006Q3-Jw
	for myserver-commit@gnu.org; Fri, 31 Jul 2009 22:30:30 +0000
Received: from gscrivano by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gscrivano@savannah.gnu.org>) id 1MX0cL-0006PH-Uf
	for myserver-commit@gnu.org; Fri, 31 Jul 2009 22:30:30 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 20fc8ae23b82d5d05b1bf79cea7511e9e04c57c6
X-Git-Newrev: dde8b6efbc2a7ccc51ed0915ad1b431707120bc8
Message-Id: <E1MX0cL-0006PH-Uf@cvs.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 31 Jul 2009 22:30:28 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. dde8b6efbc2a7ccc51ed0915ad1b431707120bc8
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, 31 Jul 2009 22:30:33 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  dde8b6efbc2a7ccc51ed0915ad1b431707120bc8 (commit)
       via  a6dcee46d29a5fc880a4c93a4bffd00740661641 (commit)
       via  47e6e2dfd5cb0289723dc9c172dfa7207ace77cf (commit)
       via  7df4e5c863dcc61b64ef801f26e3c03d76fc5a7c (commit)
       via  7da09db135a59df021963791d5707e7280e7ad63 (commit)
       via  9b63ee90aac24e5bd19fdd31ec114f732b1b5a72 (commit)
       via  ba7b9bedfd28e7c6cd898d61f2694b4802646d42 (commit)
      from  20fc8ae23b82d5d05b1bf79cea7511e9e04c57c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit dde8b6efbc2a7ccc51ed0915ad1b431707120bc8
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Aug 1 00:29:59 2009 +0200

    Avoid to read from the socket when the POST data specified by Content-Length is already consumed.

diff --git a/myserver/src/protocol/http/http_data_read.cpp b/myserver/src/protocol/http/http_data_read.cpp
index 274f68b..3e15e68 100644
--- a/myserver/src/protocol/http/http_data_read.cpp
+++ b/myserver/src/protocol/http/http_data_read.cpp
@@ -230,7 +230,7 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
 int HttpDataRead::readPostData(HttpThreadContext* td, int* httpRetCode)
 {
   int contentLength = 0;
-
+  bool contentLengthSpecified = false;
   u_long nbw = 0;
   u_long bufferDataSize = 0;
 
@@ -265,7 +265,7 @@ int HttpDataRead::readPostData(HttpThreadContext* td, int* httpRetCode)
   if(td->request.contentLength.length())
   {
     contentLength = atoi(td->request.contentLength.c_str());
-
+    contentLengthSpecified = true;
     if(contentLength < 0)
     {
       *httpRetCode = 400;
@@ -279,7 +279,7 @@ int HttpDataRead::readPostData(HttpThreadContext* td, int* httpRetCode)
    *If a CONTENT-ENCODING is specified the CONTENT-LENGTH is not
    *always needed.
    */
-  if(!contentLength && td->request.isKeepAlive())
+  if(!contentLengthSpecified && td->request.isKeepAlive ())
   {
     HttpRequestHeader::Entry *content =
       td->request.other.get("Content-Encoding");
@@ -315,16 +315,16 @@ int HttpDataRead::readPostData(HttpThreadContext* td, int* httpRetCode)
   {
     if(!encoding->value->compare("chunked"))
     {
-      int ret = readChunkedPostData(td->request.uriOptsPtr,
-                                    &inPos,
-                                    bufferDataSize,
-                                    td->connection->socket,
-                                    td->secondaryBuffer->getBuffer(),
-                                    td->secondaryBuffer->getRealLength() - 1,
-                                    &nbr,
-                                    timeout,
-                                    &(td->inputData),
-                                    0);
+      int ret = readChunkedPostData (td->request.uriOptsPtr,
+                                     &inPos,
+                                     bufferDataSize,
+                                     td->connection->socket,
+                                     td->secondaryBuffer->getBuffer(),
+                                     td->secondaryBuffer->getRealLength() - 1,
+                                     &nbr,
+                                     timeout,
+                                     &(td->inputData),
+                                     0);
 
       if(ret == -1)
       {
@@ -346,49 +346,63 @@ int HttpDataRead::readPostData(HttpThreadContext* td, int* httpRetCode)
       return 1;
     }
   }
-  /* If it is not specified an encoding, read the data as it is.  */
-  else for(;;)
-  {
-
-    if(readContiguousPrimitivePostData(td->request.uriOptsPtr,
-                                       &inPos,
-                                       bufferDataSize,
-                                       td->connection->socket,
-                                       td->secondaryBuffer->getBuffer(),
-                                       td->secondaryBuffer->getRealLength() - 1,
-                                       &nbr,
-                                       timeout))
+  else
     {
-      td->inputData.close();
-      FilesUtility::deleteFile(td->inputDataPath);
-      *httpRetCode = 400;
-      return 1;
+      /* If it is not specified an encoding, read the data as it is.  */
+      if (!contentLengthSpecified)
+        {
+          *httpRetCode = 400;
+          return 1;
+        }
+
+      for (;;)
+        {
+
+          /* Do not try to read more than what we expect.  */
+          u_long dimBuffer = std::min (td->secondaryBuffer->getRealLength() - 1l,
+                                       length);
+
+          if (readContiguousPrimitivePostData (td->request.uriOptsPtr,
+                                               &inPos,
+                                               bufferDataSize,
+                                               td->connection->socket,
+                                               td->secondaryBuffer->getBuffer (),
+                                               dimBuffer,
+                                               &nbr,
+                                               timeout))
+            {
+              td->inputData.close ();
+              FilesUtility::deleteFile (td->inputDataPath);
+              *httpRetCode = 400;
+              return 1;
+            }
+
+          if (nbr <= length)
+            length -= nbr;
+          else
+            {
+              td->inputData.close ();
+              FilesUtility::deleteFile (td->inputDataPath);
+              *httpRetCode = 400;
+              return 1;
+            }
+
+          td->secondaryBuffer->getBuffer ()[nbr] = '\0';
+
+          if (nbr && td->inputData.writeToFile (td->secondaryBuffer->getBuffer (),
+                                                nbr, &nbw))
+            {
+              td->inputDataPath.assign ("");
+              td->outputDataPath.assign ("");
+              td->inputData.close ();
+              return -1;
+            }
+
+          if (!length)
+            break;
+        }
     }
 
-    if(nbr <= length)
-      length -= nbr;
-    else
-    {
-      td->inputData.close();
-      FilesUtility::deleteFile(td->inputDataPath);
-      *httpRetCode = 400;
-      return 1;
-    }
-
-    td->secondaryBuffer->getBuffer()[nbr] = '\0';
-
-    if(nbr && td->inputData.writeToFile(td->secondaryBuffer->getBuffer(), nbr, &nbw))
-    {
-      td->inputDataPath.assign("");
-      td->outputDataPath.assign("");
-      td->inputData.close();
-      return -1;
-    }
-
-    if(!length)
-      break;
-  }
-
   td->inputData.seek (0);
   return 0;
 }



commit a6dcee46d29a5fc880a4c93a4bffd00740661641
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Jul 31 22:53:58 2009 +0200

    By default allow anonymous access to the FTP server.

diff --git a/myserver/binaries/myserver.default.windows.xml b/myserver/binaries/myserver.default.windows.xml
index 77f11ad..5bb5d83 100755
--- a/myserver/binaries/myserver.default.windows.xml
+++ b/myserver/binaries/myserver.default.windows.xml
@@ -106,7 +106,7 @@
 
   <!--FTP GLOBAL CONFIGURATION-->
   <!--ALLOW ANONYMOUS LOGIN-->
-  <DEFINE name="ftp.allow_anonymous" value="NO" />
+  <DEFINE name="ftp.allow_anonymous" value="YES" />
 
   <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
   <DEFINE name="ftp.anonymous_need_pass" value="NO" />
diff --git a/myserver/binaries/myserver.default.xml b/myserver/binaries/myserver.default.xml
index 77f11ad..5bb5d83 100755
--- a/myserver/binaries/myserver.default.xml
+++ b/myserver/binaries/myserver.default.xml
@@ -106,7 +106,7 @@
 
   <!--FTP GLOBAL CONFIGURATION-->
   <!--ALLOW ANONYMOUS LOGIN-->
-  <DEFINE name="ftp.allow_anonymous" value="NO" />
+  <DEFINE name="ftp.allow_anonymous" value="YES" />
 
   <!--IF ANONYMOUS ALLOWED, TELLS IF NEEDS PASS-->
   <DEFINE name="ftp.anonymous_need_pass" value="NO" />



commit 47e6e2dfd5cb0289723dc9c172dfa7207ace77cf
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Jul 31 22:51:53 2009 +0200

    Report when the MSCGI library can't be opened correctly.

diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp b/myserver/src/http_handler/mscgi/mscgi.cpp
index f8d9b95..1177d54 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -118,17 +118,24 @@ int MsCgi::send(HttpThreadContext* td, const char* exec, const char* cmdLine,
 
   ret = hinstLib.loadLibrary(exec, 0);
 
-  if (!ret) 
-  { 
-    td->secondaryBuffer->getAt(0) = '\0';
+  if (ret)
+  {
+    string msg;
+    msg.assign ("MSCGI: cannot load ");
+    msg.append (exec);
+    td->connection->host->warningsLogWrite (msg.c_str ());
+    chain.clearAllFilters ();
+
+    /* Internal server error.  */
+    return td->http->raiseHTTPError(500);
+  }
 
-    ProcMain = (CGIMAIN) hinstLib.getProc( "myserver_main"); 
+  td->secondaryBuffer->getAt(0) = '\0';
 
-    if(ProcMain)
-    {
-      (ProcMain)(td->request.uriOpts.c_str (), &data);
-    }
-    else
+  ProcMain = (CGIMAIN) hinstLib.getProc( "myserver_main");
+  if(ProcMain)
+    (ProcMain)(td->request.uriOpts.c_str (), &data);
+  else
     {
       string msg;
       msg.assign("MSCGI: error accessing entrypoint for ");
@@ -136,15 +143,9 @@ int MsCgi::send(HttpThreadContext* td, const char* exec, const char* cmdLine,
       td->connection->host->warningsLogWrite(msg.c_str());
       return td->http->raiseHTTPError(500);
     }
-    hinstLib.close();
-  } 
-  else
-  {
-    chain.clearAllFilters(); 
+  hinstLib.close();
+
 
-    /* Internal server error.  */
-    return td->http->raiseHTTPError(500);
-  }
   if(data.errorPage)
   {
     chain.clearAllFilters(); 



commit 7df4e5c863dcc61b64ef801f26e3c03d76fc5a7c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Jul 31 22:34:02 2009 +0200

    Socket::read returns immediately when the socket is non blocking.

diff --git a/myserver/src/base/socket/socket.cpp b/myserver/src/base/socket/socket.cpp
index da7d08c..7664dff 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -627,10 +627,7 @@ int Socket::recv(char* buffer,int len,int flags)
   int err = 0;
 
 #ifdef WIN32
-  do
-  {
-    err = ::recv(socketHandle, buffer, len, flags);
-  }while((err == SOCKET_ERROR) && (GetLastError() == WSAEWOULDBLOCK));
+  err = ::recv(socketHandle, buffer, len, flags);
 
   if ( err == SOCKET_ERROR && GetLastError() == WSAEWOULDBLOCK && isNonBlocking)
     return 0;
diff --git a/myserver/src/protocol/ftp/ftp.cpp b/myserver/src/protocol/ftp/ftp.cpp
index 34f7d25..46ad2f6 100755
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -213,7 +213,7 @@ struct reply
     std::string sText;
 };
 
-struct reply reply_table[] = {
+static struct reply reply_table[] = {
   {120, "Service ready in %s minutes."},
   {125, "Data connection already open; transfer starting."},
   {150, "File status okay; about to open data connection."},



commit 7da09db135a59df021963791d5707e7280e7ad63
Merge: 9b63ee9 20fc8ae
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 30 20:00:52 2009 +0200

    Merge branch 'master' of file:///home/gscrivano/myserver/myserver




commit 9b63ee90aac24e5bd19fdd31ec114f732b1b5a72
Merge: ba7b9be 814f9d5
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Jul 30 18:44:28 2009 +0200

    Merge branch 'master' of file:///home/gscrivano/myserver/myserver




commit ba7b9bedfd28e7c6cd898d61f2694b4802646d42
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Jul 19 21:22:38 2009 +0200

    Compile MSCGI examples under Windows.

diff --git a/myserver/binaries/web/Makefile.am b/myserver/binaries/web/Makefile.am
index b2e9ad6..cf26f49 100644
--- a/myserver/binaries/web/Makefile.am
+++ b/myserver/binaries/web/Makefile.am
@@ -1,5 +1,6 @@
+
 if BUILD_MSCGI
-	CGI_SRC = cgi-src
+CGI_SRC = cgi-src
 endif
 
 SUBDIRS = cgi-bin $(CGI_SRC) downloads
diff --git a/myserver/configure.in b/myserver/configure.in
index 001a09a..92ac4e5 100644
--- a/myserver/configure.in
+++ b/myserver/configure.in
@@ -100,7 +100,8 @@ AC_CHECK_LIB(gcrypt, gcry_control, AC_DEFINE(GCRY_CONTROL, 1, [Define if the gcr
 
 case "${host}" in
     *-*-mingw32*)
-     LDFLAGS="$LDFLAGS -lwsock32 -lgdi32 -lole32  -luuid -luserenv"
+     LDFLAGS="-lwsock32 -lgdi32 -lole32  -luuid -luserenv $LDFLAGS"
+     MAKE_MSCGI=yes
      ;;
   *)
      dnl Looking for pthreads
@@ -124,7 +125,6 @@ case "${host}" in
                 *** MSCGI support will not function
                     ])
          DL_LIB=""
-         MAKE_MSCGI=no
    fi
 
 
@@ -310,6 +310,10 @@ AM_CONDITIONAL(BUILD_TESTS, test "$MAKE_TESTS" = "yes")
 AM_CONDITIONAL(BUILD_MSCGI, test "$MAKE_MSCGI" = "yes")
 AM_CONDITIONAL(BUILD_DOC, test "$MAKE_DOC" = "yes")
 
+AC_SUBST(BUILD_TESTS)
+AC_SUBST(BUILD_DOC)
+AC_SUBST(BUILD_MSCGI)
+
 dnl AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([
     Makefile
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index 730671c..2e93e63 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -23,13 +23,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 extern "C"
 {
 #if GCRY_CONTROL
-#include <errno.h>
-#include <gcrypt.h>
+
+# include <errno.h>
+
+# ifdef WIN32
+#  undef socklen_t
+# endif
+
+# include <gcrypt.h>
+
+# ifdef HAVE_PTHREAD
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+# endif
+
 #endif
 
 #ifdef HAVE_PTHREAD
-#include <pthread.h>
+# include <pthread.h>
 #endif
 }
 
@@ -99,7 +109,7 @@ void initializeSSL ()
 
   if (!initialized)
   {
-#if GCRY_CONTROL
+#if GCRY_CONTROL && HAVE_PTHREAD
     gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 #endif
     gnutls_global_init ();

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/myserver.default.windows.xml |    2 +-
 myserver/binaries/myserver.default.xml         |    2 +-
 myserver/src/base/socket/socket.cpp            |    5 +-
 myserver/src/http_handler/mscgi/mscgi.cpp      |   35 ++++----
 myserver/src/protocol/ftp/ftp.cpp              |    2 +-
 myserver/src/protocol/http/http_data_read.cpp  |  120 +++++++++++++-----------
 6 files changed, 89 insertions(+), 77 deletions(-)


hooks/post-receive
-- 
GNU MyServer



