[prev in list] [next in list] [prev in thread] [next in thread] 

List:       prelude-cvslog
Subject:    [prelude-cvslog] r5904 - in trunk/prewikka: . scripts
From:       noreply () prelude-ids ! org
Date:       2005-03-31 18:31:10
Message-ID: 20050331183110.135696408EA () mail ! prelude-ids ! org
[Download RAW message or body]

Author: nicolas
Date: 2005-03-31 20:31:08 +0200 (Thu, 31 Mar 2005)
New Revision: 5904

Added:
   trunk/prewikka/scripts/prewikka-httpd
Removed:
   trunk/prewikka/scripts/prewikka-httpd.py
Modified:
   trunk/prewikka/MANIFEST.in
   trunk/prewikka/setup.py
Log:
rename prewikka-httpd.py in prewikka-httpd



Modified: trunk/prewikka/MANIFEST.in
===================================================================
--- trunk/prewikka/MANIFEST.in	2005-03-31 18:24:44 UTC (rev 5903)
+++ trunk/prewikka/MANIFEST.in	2005-03-31 18:31:08 UTC (rev 5904)
@@ -1,6 +1,6 @@
 include database/*.sql
 include cgi-bin/*.cgi
-include scripts/*.py
+include scripts/*
 include htdocs/images/*
 include htdocs/css/*.css
 include htdocs/js/*.js

Copied: trunk/prewikka/scripts/prewikka-httpd (from rev 5899, trunk/prewikka/scripts/prewikka-httpd.py)

Deleted: trunk/prewikka/scripts/prewikka-httpd.py
===================================================================
--- trunk/prewikka/scripts/prewikka-httpd.py	2005-03-31 18:24:44 UTC (rev 5903)
+++ trunk/prewikka/scripts/prewikka-httpd.py	2005-03-31 18:31:08 UTC (rev 5904)
@@ -1,133 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2004,2005 PreludeIDS Technologies. All Rights Reserved.
-# Author: Nicolas Delon <nicolas.delon@prelude-ids.com>
-#
-# This file is part of the PreludeDB library.
-#
-# 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, 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; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import sys
-import os, os.path
-import time
-
-import cgi
-import urllib
-import mimetypes
-import shutil
-
-import SocketServer
-import BaseHTTPServer
-
-from prewikka import Core, Request, siteconfig
-
-
-class PrewikkaServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
-    def __init__(self, *args, **kwargs):
-        self.core = Core.Core()
-        apply(BaseHTTPServer.HTTPServer.__init__, (self,) + args, kwargs)
-        
-
-
-class PrewikkaRequestHandler(Request.Request, BaseHTTPServer.BaseHTTPRequestHandler):
-    def getCookieString(self):
-        return self.headers.get("Cookie")
-
-    def getQueryString(self):
-        return self._query_string
-
-    def getReferer(self):
-        try:
-            return self.input_headers["referer"]
-        except KeyError:
-            return ""
-
-    def write(self, data):
-        self.wfile.write(data)
-    
-    def read(self, *args, **kwargs):
-        return apply(self.rfile.read, args, kwargs)
-    
-    def log_request(self, *args, **kwargs):
-        pass
-
-    def log_error(self, *args, **kwargs):
-        pass
-
-    def _processDynamic(self, arguments):
-        self.input_headers.update(self.headers)
-        
-        for name, value in arguments.items():
-            self.arguments[name] = (len(value) == 1) and value[0] or value
-            
-        self.server.core.process(self)
-        
-    def sendResponse(self):
-        self.send_response(200)
-        Request.Request.sendResponse(self)
-
-    def _processStatic(self):
-        filename = os.path.abspath(siteconfig.htdocs + urllib.unquote(self.path[len("prewikka/"):]))
-        if filename.find(os.path.abspath(siteconfig.htdocs)) != 0:
-            self.send_error(403, filename)
-            return
-        
-        # the following piece of code is from tracd of the trac project
-        # (http://www.edgewall.com/products/trac/)
-        try:
-            f = open(filename, 'r')
-        except IOError:
-            self.send_error(404, filename)
-            return
-        
-        self.send_response(200)
-        mtype, enc = mimetypes.guess_type(filename)
-        stat = os.fstat(f.fileno())
-        content_length = stat[6]
-        last_modified = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(stat[8]))
-        self.send_header('Content-Type', mtype)
-        self.send_header('Content-Length', str(content_length))
-        self.send_header('Last-Modified', last_modified)
-        self.end_headers()
-        shutil.copyfileobj(f, self.wfile)
-        
-    def do_GET(self):
-        self._query_string = self.path
-        self.init()
-        if self.path == "/":
-            self._processDynamic({ })
-        elif self.path.find("?") == 1:
-            self._processDynamic(cgi.parse_qs(self.path[2:]))
-        else:
-            self._processStatic()
-
-    def do_HEAD(self):
-        self.do_GET()
-
-    def do_POST(self):
-        self._query_string = cgi.parse_qs(self.rfile.read(int(self.headers["Content-Length"])))
-        self.init()
-        self._processDynamic(self._query_string)
-
-    def getClientAddress(self):
-        return self.client_address[0]
-
-    def getClientPort(self):
-        return self.client_address[1]
-
-
-
-server = PrewikkaServer(("0.0.0.0", 8000), PrewikkaRequestHandler)
-server.serve_forever()

Modified: trunk/prewikka/setup.py
===================================================================
--- trunk/prewikka/setup.py	2005-03-31 18:24:44 UTC (rev 5903)
+++ trunk/prewikka/setup.py	2005-03-31 18:31:08 UTC (rev 5904)
@@ -116,7 +116,7 @@
                    ("share/prewikka/htdocs/css", glob.glob("htdocs/css/*.css")),
                    ("share/prewikka/htdocs/js", glob.glob("htdocs/js/*.js")),
                    ("share/prewikka/database", glob.glob("database/*.sql")) ],
-      scripts=[ "scripts/prewikka-httpd.py" ],
+      scripts=[ "scripts/prewikka-httpd" ],
       conf_files=[ "conf/prewikka.conf" ],
       cmdclass={ 'build_py': my_build_py,
                  'install': my_install },


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic