Update of /cvsroot/freevo/freevo/src/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23123/www
Modified Files:
base.py server.py
Log Message:
small update, still not working
Index: server.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/server.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** server.py 1 Dec 2004 15:11:42 -0000 1.3
--- server.py 18 Dec 2004 18:18:40 -0000 1.4
***************
*** 67,75 ****
path = self.path
if os.path.splitext(path)[1]:
! path = os.path.abspath(self.server.htdocs + path)
! if not path.startswith(self.server.htdocs):
! print 'Sandbox violation: %s' % path
self.send_error(404, "File not found")
- return None
ctype = self.guess_type(path)
--- 67,80 ----
path = self.path
if os.path.splitext(path)[1]:
! for htdocs in self.server.htdocs:
! path = os.path.abspath(htdocs + path)
! if not path.startswith(htdocs):
! print 'Sandbox violation: %s' % path
! self.send_error(404, "File not found")
! return None
! if os.path.isfile(path):
! break
! else:
self.send_error(404, "File not found")
ctype = self.guess_type(path)
***************
*** 244,248 ****
# launch the server on port 8080
Server('', config.WWW_PORT, RequestHandler, ['src/www', 'www'],
! os.path.abspath('src/www/htdocs'))
print "HTTPServer running on port %s" % str(config.WWW_PORT)
--- 249,253 ----
# launch the server on port 8080
Server('', config.WWW_PORT, RequestHandler, ['src/www', 'www'],
! [os.path.abspath('src/www/htdocs')])
print "HTTPServer running on port %s" % str(config.WWW_PORT)
Index: base.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/base.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** base.py 21 Oct 2004 18:02:13 -0000 1.1
--- base.py 18 Dec 2004 18:18:39 -0000 1.2
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.2 2004/12/18 18:18:39 dischi
+ # small update, still not working
+ #
# Revision 1.1 2004/10/21 18:02:13 dischi
# example resources for the webserver
***************
*** 136,140 ****
# (_('Manual Recording'),_('Schedule a Manual
Recording'),'%smanualrecord.rpy' % str(strprefix)),
# (_('Search'),_('Advanced Search Page'),'%ssearch.rpy' %
str(strprefix)),
! (_('Help'),_('View Online Help and Documentation'),'%shelp/'
% str(strprefix))]
try:
--- 139,143 ----
# (_('Manual Recording'),_('Schedule a Manual
Recording'),'%smanualrecord.rpy' % str(strprefix)),
# (_('Search'),_('Advanced Search Page'),'%ssearch.rpy' %
str(strprefix)),
! (_('Doc'),_('View Online Help and Documentation'),'%sdoc' %
str(strprefix))]
try:
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
