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 2003/05/29 16:44:34 UTC
cvs commit: httpd-python/src Makefile.in psp_parser.c requestobject.c
grisha 2003/05/29 07:44:34
Modified: dist Makefile.in
src Makefile.in psp_parser.c requestobject.c
Log:
Added Py_THREAD_ALLOW's suggested by Greg Stein.
Also fixed the src/Makefile not to try to compile _psp since it is now
taken care of by distutils in dist/setup.py.
Revision Changes Path
1.5 +4 -10 httpd-python/dist/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/dist/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 29 May 2003 14:15:46 -0000 1.4
+++ Makefile.in 29 May 2003 14:44:33 -0000 1.5
@@ -60,15 +60,8 @@
PYTHON_BIN=@PYTHON_BIN@
MP_VERSION=@MP_VERSION@
-dist: unixdist
-
-unixdist: mod_python src
- @if [ ! -f dist/mod_python-$(MP_VERSION).tar.gz ]; then \
- echo "Building a source distribution"; \
- $(PYTHON_BIN) setup.py sdist; \
- else \
- echo "Source distribution found"; \
- fi
+build: mod_python src
+ $(PYTHON_BIN) setup.py build
# this one requires at least python 2.3
windist: mod_python.so
@@ -78,6 +71,7 @@
# this may require root privilidges
install_py_lib: mod_python src
+ @cd src; $(MAKE) psp_parser.c
$(PYTHON_BIN) setup.py install --optimize 2 --force; \
mod_python.so:
1.32 +0 -1 httpd-python/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/src/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.in 29 May 2003 14:15:47 -0000 1.31
+++ Makefile.in 29 May 2003 14:44:33 -0000 1.32
@@ -70,7 +70,6 @@
srcdir=.
SRCS= mod_python.c _apachemodule.c requestobject.c tableobject.c util.c \
- psp_string.c psp_parser.c psp_parser.c _pspmodule.c \
serverobject.c connobject.c filterobject.c hlist.c hlistobject.c
all: @ALL@
1.6 +1 -1 httpd-python/src/psp_parser.c
Index: psp_parser.c
===================================================================
RCS file: /home/cvs/httpd-python/src/psp_parser.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
1.46 +5 -1 httpd-python/src/requestobject.c
Index: requestobject.c
===================================================================
RCS file: /home/cvs/httpd-python/src/requestobject.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- requestobject.c 22 May 2003 20:25:07 -0000 1.45
+++ requestobject.c 29 May 2003 14:44:33 -0000 1.46
@@ -819,16 +819,20 @@
if (! PyArg_ParseTuple(args, "s|ll", &fname, &offset, &len))
return NULL; /* bad args */
+ Py_BEGIN_ALLOW_THREADS
status=apr_stat(&finfo, fname,
APR_READ, self->request_rec->pool);
+ Py_END_ALLOW_THREADS
if (status != APR_SUCCESS) {
PyErr_SetString(PyExc_IOError, "Could not stat file for reading");
return NULL;
}
+ Py_BEGIN_ALLOW_THREADS
status=apr_file_open(&fd, fname,
APR_READ, finfo.protection,
self->request_rec->pool);
+ Py_END_ALLOW_THREADS
if (status != APR_SUCCESS) {
PyErr_SetString(PyExc_IOError, "Could not open file for reading");
return NULL;