svn commit: r388893 - in /httpd/mod_python/trunk: Doc/appendixc.tex lib/python/mod_python/__init__.py lib/python/mod_python/apache.py src/include/mpversion.h

[gr...@apache.org]

Author: grahamd
Date: Sun Mar 26 02:47:21 2006
New Revision: 388893

URL: http://svn.apache.org/viewcvs?rev=388893&view=rev
Log:
Debug error page returned to client when an exception in a handler
occurred wasn't escaping special HTML characters in the traceback or
the details of the exception. (MODPYTHON-151)

Modified:
    httpd/mod_python/trunk/Doc/appendixc.tex
    httpd/mod_python/trunk/lib/python/mod_python/__init__.py
    httpd/mod_python/trunk/lib/python/mod_python/apache.py
    httpd/mod_python/trunk/src/include/mpversion.h

Modified: httpd/mod_python/trunk/Doc/appendixc.tex
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/Doc/appendixc.tex?rev=388893&r1=388892&r2=388893&view=diff
==============================================================================
--- httpd/mod_python/trunk/Doc/appendixc.tex (original)
+++ httpd/mod_python/trunk/Doc/appendixc.tex Sun Mar 26 02:47:21 2006
@@ -193,6 +193,11 @@
       In a multithread MPM, the \code{apache.init()} function could be called
       more than once for a specific interpreter instance whereas it should
       only be called once.
+    \item
+      (\citetitle[http://issues.apache.org/jira/browse/MODPYTHON-151]{MODPYTHON-151})
+      Debug error page returned to client when an exception in a handler
+      occurred wasn't escaping special HTML characters in the traceback or
+      the details of the exception.
   \end{itemize}
 
 \chapter{Changes from Version (3.2.7)\label{app-changes-from-3.2.7}}

Modified: httpd/mod_python/trunk/lib/python/mod_python/__init__.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/__init__.py?rev=388893&r1=388892&r2=388893&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/__init__.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/__init__.py Sun Mar 26 02:47:21 2006
@@ -20,5 +20,5 @@
 __all__ = ["apache", "cgihandler", "psp",
            "publisher", "util", "python22"]
 
-version = "3.3.0-dev-20060325"
+version = "3.3.0-dev-20060326"
 

Modified: httpd/mod_python/trunk/lib/python/mod_python/apache.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/apache.py?rev=388893&r1=388892&r2=388893&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/apache.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/apache.py Sun Mar 26 02:47:21 2006
@@ -25,6 +25,7 @@
 import stat
 import imp
 import types
+import cgi
 import _apache
 
 try:
@@ -467,7 +468,7 @@
 
                     s = '\n<pre>\nMod_python error: "%s %s"\n\n' % (phase, hname)
                     for e in traceback.format_exception(etype, evalue, etb):
-                        s = s + e + '\n'
+                        s = s + cgi.escape(e) + '\n'
                     s = s + "</pre>\n"
 
                     if filter:

Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mpversion.h?rev=388893&r1=388892&r2=388893&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Sun Mar 26 02:47:21 2006
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 3
 #define MPV_PATCH 0
-#define MPV_BUILD 20060325
-#define MPV_STRING "3.3.0-dev-20060325"
+#define MPV_BUILD 20060326
+#define MPV_STRING "3.3.0-dev-20060326"