You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2006/03/19 04:24:16 UTC
svn commit: r386920 - in /httpd/mod_python/trunk: Doc/appendixc.tex
lib/python/mod_python/__init__.py lib/python/mod_python/apache.py
src/_apachemodule.c src/include/mpversion.h
Author: grahamd
Date: Sat Mar 18 19:24:14 2006
New Revision: 386920
URL: http://svn.apache.org/viewcvs?rev=386920&view=rev
Log:
Added missing Apache contants apache.PROXYREQ_RESPONSE and
apache.HTTP_UPGRADE_REQUIRED. Also added new constants for Apache magic
mime types and values for interpreting the req.connection.keepalive and
req.read_body members. (MODPYTHON-148)
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/_apachemodule.c
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=386920&r1=386919&r2=386920&view=diff
==============================================================================
--- httpd/mod_python/trunk/Doc/appendixc.tex (original)
+++ httpd/mod_python/trunk/Doc/appendixc.tex Sat Mar 18 19:24:14 2006
@@ -165,6 +165,12 @@
(\citetitle[http://issues.apache.org/jira/browse/MODPYTHON-147]{MODPYTHON-147})
Stopped directories being added to \code{sys.path} multiple times when
\code{PythonImport} and \code{PythonPath} directive used.
+ \item
+ (\citetitle[http://issues.apache.org/jira/browse/MODPYTHON-148]{MODPYTHON-148})
+ Added missing Apache contants \code{apache.PROXYREQ_RESPONSE} and
+ \code{apache.HTTP_UPGRADE_REQUIRED}. Also added new constants for
+ Apache magic mime types and values for interpreting the
+ \code{req.connection.keepalive} and \code{req.read_body} members.
\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=386920&r1=386919&r2=386920&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/__init__.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/__init__.py Sat Mar 18 19:24:14 2006
@@ -20,5 +20,5 @@
__all__ = ["apache", "cgihandler", "psp",
"publisher", "util", "python22"]
-version = "3.3.0-dev-20060317"
+version = "3.3.0-dev-20060319"
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=386920&r1=386919&r2=386920&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/apache.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/apache.py Sat Mar 18 19:24:14 2006
@@ -890,6 +890,7 @@
HTTP_UNPROCESSABLE_ENTITY = 422
HTTP_LOCKED = 423
HTTP_FAILED_DEPENDENCY = 424
+HTTP_UPGRADE_REQUIRED = 426
HTTP_INTERNAL_SERVER_ERROR = 500
HTTP_NOT_IMPLEMENTED = 501
HTTP_BAD_GATEWAY = 502
@@ -969,8 +970,9 @@
# for req.proxyreq
PROXYREQ_NONE = 0 # No proxy
-PROXYREQ_PROXY = 1 # Standard proxy
+PROXYREQ_PROXY = 1 # Standard proxy
PROXYREQ_REVERSE = 2 # Reverse proxy
+PROXYREQ_RESPONSE = 3 # Origin response
# methods for req.allow_method()
M_GET = 0 # RFC 2616: HTTP
@@ -1031,3 +1033,18 @@
AP_MPMQ_MAX_REQUESTS_DAEMON= 11 # Max # of requests per daemon
AP_MPMQ_MAX_DAEMONS = 12 # Max # of daemons by config
+# magic mime types
+CGI_MAGIC_TYPE = "application/x-httpd-cgi"
+INCLUDES_MAGIC_TYPE = "text/x-server-parsed-html"
+INCLUDES_MAGIC_TYPE3 = "text/x-server-parsed-html3"
+DIR_MAGIC_TYPE = "httpd/unix-directory"
+
+# for req.read_body
+REQUEST_NO_BODY = 0
+REQUEST_CHUNKED_ERROR = 1
+REQUEST_CHUNKED_DECHUNK = 2
+
+# for req.connection.keepalive
+AP_CONN_UNKNOWN = _apache.AP_CONN_UNKNOWN
+AP_CONN_CLOSE = _apache.AP_CONN_CLOSE
+AP_CONN_KEEPALIVE = _apache.AP_CONN_KEEPALIVE
Modified: httpd/mod_python/trunk/src/_apachemodule.c
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/_apachemodule.c?rev=386920&r1=386919&r2=386920&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/_apachemodule.c (original)
+++ httpd/mod_python/trunk/src/_apachemodule.c Sat Mar 18 19:24:14 2006
@@ -703,7 +703,7 @@
DL_EXPORT(void) init_apache()
{
- PyObject *m, *d;
+ PyObject *m, *d, *o;
/* initialize types XXX break windows? */
MpTable_Type.ob_type = &PyType_Type;
@@ -723,6 +723,15 @@
PyDict_SetItemString(d, "table", (PyObject *)&MpTable_Type);
+ o = PyInt_FromLong(AP_CONN_UNKNOWN);
+ PyDict_SetItemString(d, "AP_CONN_UNKNOWN", o);
+ Py_DECREF(o);
+ o = PyInt_FromLong(AP_CONN_CLOSE);
+ PyDict_SetItemString(d, "AP_CONN_CLOSE", o);
+ Py_DECREF(o);
+ o = PyInt_FromLong(AP_CONN_KEEPALIVE);
+ PyDict_SetItemString(d, "AP_CONN_KEEPALIVE", o);
+ Py_DECREF(o);
}
PyObject *get_ServerReturn()
Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mpversion.h?rev=386920&r1=386919&r2=386920&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Sat Mar 18 19:24:14 2006
@@ -1,5 +1,5 @@
#define MPV_MAJOR 3
#define MPV_MINOR 3
#define MPV_PATCH 0
-#define MPV_BUILD 20060317
-#define MPV_STRING "3.3.0-dev-20060317"
+#define MPV_BUILD 20060319
+#define MPV_STRING "3.3.0-dev-20060319"