[myserver-commit] [2897] Removed `HttpHeaderChecker' class.

[Giuseppe Scrivano]

Revision: 2897
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2897
Author:   gscrivano
Date:     2008-10-22 18:05:14 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
Removed `HttpHeaderChecker' class.  It is obsoleted by the new security 
functionalities.

Modified Paths:
--------------
    trunk/myserver/include/conf/mime/mime_manager.h
    trunk/myserver/include/protocol/http/Makefile.am
    trunk/myserver/myserver.dev
    trunk/myserver/src/conf/mime/mime_manager.cpp
    trunk/myserver/src/protocol/http/Makefile.am
    trunk/myserver/src/protocol/http/http.cpp

Removed Paths:
-------------
    trunk/myserver/include/protocol/http/http_header_checker.h
    trunk/myserver/src/protocol/http/http_header_checker.cpp

Modified: trunk/myserver/include/conf/mime/mime_manager.h
===================================================================
--- trunk/myserver/include/conf/mime/mime_manager.h     2008-10-21 20:53:57 UTC 
(rev 2896)
+++ trunk/myserver/include/conf/mime/mime_manager.h     2008-10-22 18:05:14 UTC 
(rev 2897)
@@ -21,7 +21,6 @@
 
 #include <include/base/utility.h>
 #include <include/base/hash_map/hash_map.h>
-#include <include/protocol/http/http_header_checker.h>
 #include <include/base/sync/read_write_lock.h>
 
 #ifdef WIN32
@@ -99,9 +98,8 @@
        int command;
        string cgiManager;
        unsigned int extensionHashCode;
-       HttpHeaderChecker headerChecker;
        MimeRecord()
-       {headerChecker.clear(); filters.clear(); extension.assign(""); 
+       {filters.clear(); extension.assign(""); 
                mimeType.assign(""); cgiManager.assign(""); cmdName.assign("");
                command=extensionHashCode = 0;}
        MimeRecord(MimeRecord&);

Modified: trunk/myserver/include/protocol/http/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/http/Makefile.am    2008-10-21 20:53:57 UTC 
(rev 2896)
+++ trunk/myserver/include/protocol/http/Makefile.am    2008-10-22 18:05:14 UTC 
(rev 2897)
@@ -1,4 +1,4 @@
 httpincludedir=$(includedir)/myserver/include/protocol/http
-httpinclude_HEADERS = http_data_handler.h http_data_read.h http_errors.h 
http.h http_header_checker.h http_header.h http_headers.h http_request.h 
http_req_security_domain.h http_response.h http_thread_context.h
+httpinclude_HEADERS = http_data_handler.h http_data_read.h http_errors.h 
http.h http_header.h http_headers.h http_request.h http_req_security_domain.h 
http_response.h http_thread_context.h
 SUBDIRS = env
 

Deleted: trunk/myserver/include/protocol/http/http_header_checker.h
===================================================================
--- trunk/myserver/include/protocol/http/http_header_checker.h  2008-10-21 
20:53:57 UTC (rev 2896)
+++ trunk/myserver/include/protocol/http/http_header_checker.h  2008-10-22 
18:05:14 UTC (rev 2897)
@@ -1,63 +0,0 @@
-/* -*- mode: c++ -*- */
-/*
-MyServer
-Copyright (C) 2005 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 HTTP_HEADER_CHECKER_H
-#define HTTP_HEADER_CHECKER_H
-
-#include "stdafx.h"
-#include <include/protocol/http/http_headers.h>
-#include <include/base/regex/myserver_regex.h>
-#include <include/protocol/http/http_request.h>
-#include <include/protocol/http/http_response.h>
-
-#include <string>
-#include <sstream>
-#include <list>
-using namespace std;
-
-class HttpHeaderChecker
-{
-public:
-  enum CMD{DENY=0,  ALLOW=1};  
-  struct Rule
-  {
-    string name;
-    Regex value;
-    CMD cmd;
-    Rule()
-    {name.assign(""); cmd=ALLOW;}
-
-    Rule(Rule& r)
-    {name.assign(r.name); value.clone(r.value); cmd=r.cmd;}
-  };
-  HttpHeaderChecker();
-  HttpHeaderChecker(HttpHeaderChecker&);
-  ~HttpHeaderChecker();  
-  void addRule(HttpHeaderChecker::Rule*);
-  void addRule(HttpHeaderChecker::Rule&);
-  void clear();
-  int isAllowed(HttpHeader*);
-  CMD getDefaultCmd();
-  void setDefaultCmd(CMD);
-  void clone(HttpHeaderChecker&);
-protected:
-  list<HttpHeaderChecker::Rule*> rules;
-  CMD defaultCmd;
-};
-
-#endif

Modified: trunk/myserver/myserver.dev
===================================================================
--- trunk/myserver/myserver.dev 2008-10-21 20:53:57 UTC (rev 2896)
+++ trunk/myserver/myserver.dev 2008-10-22 18:05:14 UTC (rev 2897)
@@ -1,7 +1,7 @@
 [Project]
 FileName=myserver.dev
 Name=myserver
-UnitCount=94
+UnitCount=112
 Type=1
 Ver=1
 ObjFiles=
@@ -87,7 +87,7 @@
 BuildCmd=
 
 [Unit5]
-FileName=src\conf\mime\mime_manager.cpp
+FileName=src\log\stream\console_stream_creator.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -97,7 +97,7 @@
 BuildCmd=
 
 [Unit6]
-FileName=src\conf\security\security_cache.cpp
+FileName=src\log\stream\file_stream.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -107,7 +107,7 @@
 BuildCmd=
 
 [Unit7]
-FileName=src\conf\security\security.cpp
+FileName=src\log\stream\log_stream.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -117,7 +117,7 @@
 BuildCmd=
 
 [Unit8]
-FileName=src\conf\vhost\vhost.cpp
+FileName=src\log\stream\log_stream_factory.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -127,7 +127,7 @@
 BuildCmd=
 
 [Unit9]
-FileName=src\conf\vhost\vhost_manager.cpp
+FileName=src\log\stream\socket_stream.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -137,7 +137,7 @@
 BuildCmd=
 
 [Unit10]
-FileName=src\connections_scheduler\connections_scheduler.cpp
+FileName=src\log\stream\file_stream_creator.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -147,7 +147,7 @@
 BuildCmd=
 
 [Unit11]
-FileName=src\connections_scheduler\listen_threads.cpp
+FileName=src\log\stream\log_stream_creator.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -157,7 +157,7 @@
 BuildCmd=
 
 [Unit12]
-FileName=src\http_handler\wincgi\wincgi.cpp
+FileName=src\log\stream\console_stream.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -167,7 +167,7 @@
 BuildCmd=
 
 [Unit13]
-FileName=src\http_handler\cgi\cgi.cpp
+FileName=src\log\stream\socket_stream_creator.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -177,7 +177,7 @@
 BuildCmd=
 
 [Unit14]
-FileName=src\http_handler\mscgi\mscgi.cpp
+FileName=src\conf\mime\mime_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -187,7 +187,7 @@
 BuildCmd=
 
 [Unit15]
-FileName=src\http_handler\mscgi\mscgi_manager.cpp
+FileName=src\conf\security\validator.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -197,7 +197,7 @@
 BuildCmd=
 
 [Unit16]
-FileName=src\http_handler\fastcgi\fastcgi.cpp
+FileName=src\conf\security\security_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -207,7 +207,7 @@
 BuildCmd=
 
 [Unit17]
-FileName=src\http_handler\http_file\http_file.cpp
+FileName=src\conf\security\security_domain.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -217,7 +217,7 @@
 BuildCmd=
 
 [Unit18]
-FileName=src\http_handler\scgi\scgi.cpp
+FileName=src\conf\security\auth_method.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -227,7 +227,7 @@
 BuildCmd=
 
 [Unit19]
-FileName=src\http_handler\isapi\isapi.cpp
+FileName=src\conf\security\auth_method_factory.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -237,7 +237,7 @@
 BuildCmd=
 
 [Unit20]
-FileName=src\http_handler\http_dir\http_dir.cpp
+FileName=src\conf\security\security_cache.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -247,7 +247,7 @@
 BuildCmd=
 
 [Unit21]
-FileName=src\base\utility.cpp
+FileName=src\conf\security\auth_domain.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -257,7 +257,7 @@
 BuildCmd=
 
 [Unit22]
-FileName=src\base\find_data\find_data.cpp
+FileName=src\conf\security\security_token.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -267,7 +267,7 @@
 BuildCmd=
 
 [Unit23]
-FileName=src\base\file\files_utility.cpp
+FileName=src\conf\security\xml_validator.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -277,7 +277,7 @@
 BuildCmd=
 
 [Unit24]
-FileName=src\base\file\file.cpp
+FileName=src\conf\security\validator_factory.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -287,7 +287,7 @@
 BuildCmd=
 
 [Unit25]
-FileName=src\base\pipe\pipe.cpp
+FileName=src\conf\vhost\vhost.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -297,7 +297,7 @@
 BuildCmd=
 
 [Unit26]
-FileName=src\base\base64\mime_utils.cpp
+FileName=src\conf\vhost\vhost_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -307,7 +307,7 @@
 BuildCmd=
 
 [Unit27]
-FileName=src\base\mem_buff\mem_buff.cpp
+FileName=src\connections_scheduler\connections_scheduler.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -317,7 +317,7 @@
 BuildCmd=
 
 [Unit28]
-FileName=src\base\home_dir\home_dir.cpp
+FileName=src\connections_scheduler\listen_threads.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -327,7 +327,7 @@
 BuildCmd=
 
 [Unit29]
-FileName=src\base\multicast\multicast.cpp
+FileName=src\http_handler\wincgi\wincgi.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -337,7 +337,7 @@
 BuildCmd=
 
 [Unit30]
-FileName=src\base\sync\recursive_mutex.cpp
+FileName=src\http_handler\cgi\cgi.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -347,7 +347,7 @@
 BuildCmd=
 
 [Unit31]
-FileName=src\base\sync\semaphore.cpp
+FileName=src\http_handler\mscgi\mscgi.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -357,7 +357,7 @@
 BuildCmd=
 
 [Unit32]
-FileName=src\base\sync\mutex.cpp
+FileName=src\http_handler\mscgi\mscgi_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -367,7 +367,7 @@
 BuildCmd=
 
 [Unit33]
-FileName=src\base\sync\event.cpp
+FileName=src\http_handler\fastcgi\fastcgi.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -377,7 +377,7 @@
 BuildCmd=
 
 [Unit34]
-FileName=src\base\sync\read_write_lock.cpp
+FileName=src\http_handler\http_file\http_file.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -387,7 +387,7 @@
 BuildCmd=
 
 [Unit35]
-FileName=src\base\safetime\safetime.cpp
+FileName=src\http_handler\scgi\scgi.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -397,7 +397,7 @@
 BuildCmd=
 
 [Unit36]
-FileName=src\base\socket\socket.cpp
+FileName=src\http_handler\isapi\isapi.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -407,7 +407,7 @@
 BuildCmd=
 
 [Unit37]
-FileName=src\base\socket\ssl_socket.cpp
+FileName=src\http_handler\http_dir\http_dir.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -417,7 +417,7 @@
 BuildCmd=
 
 [Unit38]
-FileName=src\base\hash_map\hash_map.cpp
+FileName=src\base\utility.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -427,7 +427,7 @@
 BuildCmd=
 
 [Unit39]
-FileName=src\base\dynamic_lib\dynamiclib.cpp
+FileName=src\base\find_data\find_data.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -437,7 +437,7 @@
 BuildCmd=
 
 [Unit40]
-FileName=src\base\process\process_server_manager.cpp
+FileName=src\base\file\files_utility.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -447,7 +447,7 @@
 BuildCmd=
 
 [Unit41]
-FileName=src\base\process\process.cpp
+FileName=src\base\file\file.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -457,7 +457,7 @@
 BuildCmd=
 
 [Unit42]
-FileName=src\base\md5\md5.cpp
+FileName=src\base\pipe\pipe.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -467,7 +467,7 @@
 BuildCmd=
 
 [Unit43]
-FileName=src\base\ssl\ssl.cpp
+FileName=src\base\base64\mime_utils.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -477,7 +477,7 @@
 BuildCmd=
 
 [Unit44]
-FileName=src\base\xml\xml_parser.cpp
+FileName=src\base\mem_buff\mem_buff.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -487,7 +487,7 @@
 BuildCmd=
 
 [Unit45]
-FileName=src\base\files_cache\cached_file_factory.cpp
+FileName=src\base\home_dir\home_dir.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -497,7 +497,7 @@
 BuildCmd=
 
 [Unit46]
-FileName=src\base\files_cache\cached_file_buffer.cpp
+FileName=src\base\multicast\multicast.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -507,7 +507,7 @@
 BuildCmd=
 
 [Unit47]
-FileName=src\base\files_cache\cached_file.cpp
+FileName=src\base\sync\recursive_mutex.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -517,7 +517,7 @@
 BuildCmd=
 
 [Unit48]
-FileName=src\base\string\stringutils.cpp
+FileName=src\base\sync\semaphore.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -527,7 +527,7 @@
 BuildCmd=
 
 [Unit49]
-FileName=src\base\string\securestr.cpp
+FileName=src\base\sync\mutex.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -537,7 +537,7 @@
 BuildCmd=
 
 [Unit50]
-FileName=src\base\regex\myserver_regex.cpp
+FileName=src\base\sync\event.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -547,7 +547,7 @@
 BuildCmd=
 
 [Unit51]
-FileName=src\base\thread\thread.cpp
+FileName=src\base\sync\read_write_lock.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -557,7 +557,7 @@
 BuildCmd=
 
 [Unit52]
-FileName=src\protocol\protocol.cpp
+FileName=src\base\safetime\safetime.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -567,7 +567,7 @@
 BuildCmd=
 
 [Unit53]
-FileName=src\protocol\protocol_buffer.cpp
+FileName=src\base\socket\socket.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -577,7 +577,7 @@
 BuildCmd=
 
 [Unit54]
-FileName=src\protocol\ftp\ftp_parser.cpp
+FileName=src\base\socket\ssl_socket.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -587,7 +587,7 @@
 BuildCmd=
 
 [Unit55]
-FileName=src\protocol\ftp\ftp_lexer.cpp
+FileName=src\base\hash_map\hash_map.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -597,7 +597,7 @@
 BuildCmd=
 
 [Unit56]
-FileName=src\protocol\ftp\ftp.cpp
+FileName=src\base\dynamic_lib\dynamiclib.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -607,7 +607,7 @@
 BuildCmd=
 
 [Unit57]
-FileName=src\protocol\control\control_header.cpp
+FileName=src\base\process\process_server_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -617,7 +617,7 @@
 BuildCmd=
 
 [Unit58]
-FileName=src\protocol\control\control_protocol.cpp
+FileName=src\base\process\process.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -627,7 +627,7 @@
 BuildCmd=
 
 [Unit59]
-FileName=src\protocol\https\https.cpp
+FileName=src\base\md5\md5.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -637,7 +637,7 @@
 BuildCmd=
 
 [Unit60]
-FileName=src\protocol\http\http_data_handler.cpp
+FileName=src\base\ssl\ssl.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -647,7 +647,7 @@
 BuildCmd=
 
 [Unit61]
-FileName=src\protocol\http\http_errors.cpp
+FileName=src\base\xml\xml_parser.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -657,7 +657,7 @@
 BuildCmd=
 
 [Unit62]
-FileName=src\protocol\http\http_response.cpp
+FileName=src\base\files_cache\cached_file_factory.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -667,7 +667,7 @@
 BuildCmd=
 
 [Unit63]
-FileName=src\protocol\http\http_data_read.cpp
+FileName=src\base\files_cache\cached_file_buffer.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -677,7 +677,7 @@
 BuildCmd=
 
 [Unit64]
-FileName=src\protocol\http\http.cpp
+FileName=src\base\files_cache\cached_file.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -687,7 +687,7 @@
 BuildCmd=
 
 [Unit65]
-FileName=src\protocol\http\http_headers.cpp
+FileName=src\base\string\stringutils.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -697,7 +697,7 @@
 BuildCmd=
 
 [Unit66]
-FileName=src\protocol\http\http_thread_context.cpp
+FileName=src\base\string\securestr.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -707,7 +707,7 @@
 BuildCmd=
 
 [Unit67]
-FileName=src\protocol\http\http_header_checker.cpp
+FileName=src\base\regex\myserver_regex.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -717,6 +717,176 @@
 BuildCmd=
 
 [Unit68]
+FileName=src\base\thread\thread.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit69]
+FileName=src\protocol\protocol.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit70]
+FileName=src\protocol\protocol_buffer.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit71]
+FileName=src\protocol\ftp\ftp_parser.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit72]
+FileName=src\protocol\ftp\ftp_lexer.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit73]
+FileName=src\protocol\ftp\ftp.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit74]
+FileName=src\protocol\control\control_header.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit75]
+FileName=src\protocol\control\control_protocol.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit76]
+FileName=src\protocol\https\https.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit77]
+FileName=src\protocol\http\http_data_handler.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit78]
+FileName=src\protocol\http\http_errors.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit79]
+FileName=src\protocol\http\http_response.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit80]
+FileName=src\protocol\http\http_req_security_domain.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit81]
+FileName=src\protocol\http\http_data_read.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit82]
+FileName=src\protocol\http\http.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit83]
+FileName=src\protocol\http\http_headers.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit84]
+FileName=src\protocol\http\http_thread_context.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit85]
 FileName=src\protocol\http\http_request.cpp
 CompileCpp=1
 Folder=myserver
@@ -726,7 +896,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit69]
+[Unit86]
 FileName=src\protocol\http\env\env.cpp
 CompileCpp=1
 Folder=myserver
@@ -736,7 +906,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit70]
+[Unit87]
 FileName=src\filter\memory_stream.cpp
 CompileCpp=1
 Folder=myserver
@@ -746,7 +916,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit71]
+[Unit88]
 FileName=src\filter\filter.cpp
 CompileCpp=1
 Folder=myserver
@@ -756,7 +926,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit72]
+[Unit89]
 FileName=src\filter\filters_chain.cpp
 CompileCpp=1
 Folder=myserver
@@ -766,7 +936,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit73]
+[Unit90]
 FileName=src\filter\stream.cpp
 CompileCpp=1
 Folder=myserver
@@ -776,7 +946,17 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit74]
+[Unit91]
+FileName=src\filter\console.cpp
+CompileCpp=1
+Folder=myserver
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit92]
 FileName=src\filter\filters_factory.cpp
 CompileCpp=1
 Folder=myserver
@@ -786,7 +966,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit75]
+[Unit93]
 FileName=src\filter\gzip\gzip_decompress.cpp
 CompileCpp=1
 Folder=myserver
@@ -796,7 +976,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit76]
+[Unit94]
 FileName=src\filter\gzip\gzip.cpp
 CompileCpp=1
 Folder=myserver
@@ -806,7 +986,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit77]
+[Unit95]
 FileName=src\plugin\generic_plugins_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -816,7 +996,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit78]
+[Unit96]
 FileName=src\plugin\plugins_namespace_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -826,7 +1006,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit79]
+[Unit97]
 FileName=src\plugin\plugins_namespace.cpp
 CompileCpp=1
 Folder=myserver
@@ -836,7 +1016,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit80]
+[Unit98]
 FileName=src\plugin\plugin.cpp
 CompileCpp=1
 Folder=myserver
@@ -846,7 +1026,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit81]
+[Unit99]
 FileName=src\plugin\plugins_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -856,7 +1036,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit82]
+[Unit100]
 FileName=src\plugin\executor\dyn_executor_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -866,7 +1046,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit83]
+[Unit101]
 FileName=src\plugin\executor\dynamic_executor.cpp
 CompileCpp=1
 Folder=myserver
@@ -876,7 +1056,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit84]
+[Unit102]
 FileName=src\plugin\http_manager\dyn_http_manager_list.cpp
 CompileCpp=1
 Folder=myserver
@@ -886,7 +1066,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit85]
+[Unit103]
 FileName=src\plugin\http_manager\dyn_http_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -896,7 +1076,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit86]
+[Unit104]
 FileName=src\plugin\protocol\dynamic_protocol.cpp
 CompileCpp=1
 Folder=myserver
@@ -906,7 +1086,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit87]
+[Unit105]
 FileName=src\plugin\protocol\protocols_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -916,7 +1096,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit88]
+[Unit106]
 FileName=src\plugin\filter\dyn_filter.cpp
 CompileCpp=1
 Folder=myserver
@@ -926,7 +1106,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit89]
+[Unit107]
 FileName=src\plugin\filter\dyn_filter_file.cpp
 CompileCpp=1
 Folder=myserver
@@ -936,7 +1116,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit90]
+[Unit108]
 FileName=src\plugin\filter\dyn_filters_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -946,7 +1126,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit91]
+[Unit109]
 FileName=src\plugin\http_command\dyn_http_command.cpp
 CompileCpp=1
 Folder=myserver
@@ -956,7 +1136,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit92]
+[Unit110]
 FileName=src\plugin\http_command\dyn_http_command_manager.cpp
 CompileCpp=1
 Folder=myserver
@@ -966,7 +1146,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit93]
+[Unit111]
 FileName=src\server\clients_thread.cpp
 CompileCpp=1
 Folder=myserver
@@ -976,7 +1156,7 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit94]
+[Unit112]
 FileName=src\server\server.cpp
 CompileCpp=1
 Folder=myserver

Modified: trunk/myserver/src/conf/mime/mime_manager.cpp
===================================================================
--- trunk/myserver/src/conf/mime/mime_manager.cpp       2008-10-21 20:53:57 UTC 
(rev 2896)
+++ trunk/myserver/src/conf/mime/mime_manager.cpp       2008-10-22 18:05:14 UTC 
(rev 2897)
@@ -77,7 +77,6 @@
   command = m.command;
   cmdName.assign(m.cmdName);
   cgiManager.assign(m.cgiManager);
-  headerChecker.clone(m.headerChecker);
 } 
 
 /*!
@@ -86,7 +85,6 @@
 void MimeRecord::clear()
 {
   filters.clear();
-  headerChecker.clear();
   extension.assign(""); 
   mimeType.assign(""); 
   cmdName.assign("");
@@ -148,54 +146,8 @@
       continue;
     rc.clear();
 
-    while(attrs)
-    {
-      if(!xmlStrcmp(attrs->name, (const xmlChar *)"defaultAction"))
-      {
-        if(attrs->children && attrs->children->content && 
-           (!xmlStrcmp(attrs->children->content, (const xmlChar *)"ALLOW")))
-          rc.headerChecker.setDefaultCmd(HttpHeaderChecker::ALLOW);
-        else
-          rc.headerChecker.setDefaultCmd(HttpHeaderChecker::DENY);
-      }
-      attrs = attrs->next;
-    }
-
     while(lcur)
     {
-      if(lcur->name && !xmlStrcmp(lcur->name, (const xmlChar *)"ACTION"))
-      {
-        HttpHeaderChecker::Rule r;
-        xmlAttr *actionAttrs = lcur->properties; 
-
-        if(lcur->children->content && lcur->children->content &&
-           (!xmlStrcmp(lcur->children->content, (const xmlChar *)"DENY")))
-          r.cmd = HttpHeaderChecker::DENY;
-        else
-          r.cmd = HttpHeaderChecker::ALLOW;
-
-        while(actionAttrs)
-        {
-          if(!xmlStrcmp(actionAttrs->name, (const xmlChar *)"name"))
-          {
-            if(actionAttrs->children && actionAttrs->children->content)
-              r.name.assign((const char*)actionAttrs->children->content);
-
-          }
-
-          if(!xmlStrcmp(actionAttrs->name, (const xmlChar *)"value"))
-          {
-            if(actionAttrs->children && actionAttrs->children->content)
-              r.value.compile((const char*)actionAttrs->children->content, 
-                              REG_EXTENDED);
-          }
-          actionAttrs=actionAttrs->next;
-
-        }
-        rc.headerChecker.addRule(r);
-      }
-
-
       if(lcur->name && !xmlStrcmp(lcur->name, (const xmlChar *)"EXT"))
       {
         if(lcur->children->content)

Modified: trunk/myserver/src/protocol/http/Makefile.am
===================================================================
--- trunk/myserver/src/protocol/http/Makefile.am        2008-10-21 20:53:57 UTC 
(rev 2896)
+++ trunk/myserver/src/protocol/http/Makefile.am        2008-10-22 18:05:14 UTC 
(rev 2897)
@@ -1,5 +1,5 @@
 lib_LIBRARIES = libhttp.a
-libhttp_a_SOURCES = http.cpp http_data_handler.cpp http_data_read.cpp 
http_errors.cpp http_header_checker.cpp http_headers.cpp http_request.cpp 
http_req_security_domain.cpp http_response.cpp http_thread_context.cpp
+libhttp_a_SOURCES = http.cpp http_data_handler.cpp http_data_read.cpp 
http_errors.cpp http_headers.cpp http_request.cpp http_req_security_domain.cpp 
http_response.cpp http_thread_context.cpp
 SUBDIRS = env
 INCLUDES = $(all_includes)
 

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp   2008-10-21 20:53:57 UTC (rev 
2896)
+++ trunk/myserver/src/protocol/http/http.cpp   2008-10-22 18:05:14 UTC (rev 
2897)
@@ -886,8 +886,7 @@
       }
     }
 
-    if(td->mime &&
-       !td->mime->headerChecker.isAllowed(&(td->request)))
+    if(td->mime)
     {
       return sendAuth();
     }

Deleted: trunk/myserver/src/protocol/http/http_header_checker.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http_header_checker.cpp    2008-10-21 
20:53:57 UTC (rev 2896)
+++ trunk/myserver/src/protocol/http/http_header_checker.cpp    2008-10-22 
18:05:14 UTC (rev 2897)
@@ -1,152 +0,0 @@
-/*
-MyServer
-Copyright (C) 2005 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 <include/protocol/http/http.h>
-#include <include/protocol/http/http_headers.h>
-#include <include/protocol/http/http_header_checker.h>
-
-#include <string>
-#include <ostream>
-
-using namespace std;
-
-extern "C" 
-{
-#ifdef WIN32
-#include <direct.h>
-#include <errno.h>
-#endif
-
-#ifdef NOT_WIN
-#include <string.h>
-#include <errno.h>
-#endif
-}
-
-/*!
- *Add a rule to check to the chain.
- */
-void HttpHeaderChecker::addRule(HttpHeaderChecker::Rule& r)
-{
-  HttpHeaderChecker::Rule* r2 = new Rule(r); 
-  if(r2)
-    addRule(r2);
-}
-
-/*!
- *Add a rule to check to the chain.
- */
-void HttpHeaderChecker::addRule(HttpHeaderChecker::Rule* r)
-{
-  rules.push_back(r);
-}
-
-/*!
- *Clear all the used memory.
- */
-void HttpHeaderChecker::clear()
-{
-  list<HttpHeaderChecker::Rule*>::iterator i = rules.begin();
-  for(;i != rules.end(); i++)
-  {
-    Rule *r = *i;
-    r->name.clear();
-    r->value.free();
-    delete r;
-  }
-  rules.clear();
-}
-
-/*!
- *Constructor.
- */
-HttpHeaderChecker::HttpHeaderChecker()
-{
-  defaultCmd=ALLOW;
-}
-
-/*!
- *Destroy the object.
- */
-HttpHeaderChecker::~HttpHeaderChecker()
-{
-  clear();
-}
-
-/*!
- *Check if the header is allowed by the chain.
- */
-int HttpHeaderChecker::isAllowed(HttpHeader* h)
-{
-  list<HttpHeaderChecker::Rule*>::iterator i = rules.begin();
-  for(; i != rules.end(); i++)
-  {
-    string *val = h->getValue((*i)->name.c_str(), 0);
-    if(val && (*i)->value.isCompiled())
-    {
-      regmatch_t pm;
-      if(!(*i)->value.exec(val->c_str(), 1,&pm, REG_NOTEOL))
-      {
-        return (*i)->cmd;
-      }
-    }
-  }
-  return defaultCmd;
-}
-
-/*!
- *Return the default action used by the chain.
- *Zero means deny access, one means that access is allowed by default.
- */
-HttpHeaderChecker::CMD HttpHeaderChecker::getDefaultCmd()
-{
-  return defaultCmd;
-}
-
-/*!
- *Set te default action to use.
- *Zero to deny access, one to allow access by default.
- */
-void HttpHeaderChecker::setDefaultCmd(HttpHeaderChecker::CMD cmd)
-{
-  defaultCmd = cmd;
-}
-
-/*!
- *Construct by copy.
- */
-HttpHeaderChecker::HttpHeaderChecker(HttpHeaderChecker& hhc)
-{
-  clone(hhc);
-}
-
-/*!
- *Create a clone of the object.
- */
-void HttpHeaderChecker::clone(HttpHeaderChecker& h)
-{
-  list<HttpHeaderChecker::Rule*>::iterator i = h.rules.begin();
-  clear();
-  for(;i != h.rules.end(); i++)
-  {
-    HttpHeaderChecker::Rule* r = new HttpHeaderChecker::Rule(*(*i));
-    addRule(r);
-  }  
-
-  defaultCmd = h.defaultCmd;
-}