cvs commit: httpd-python/src Makefile.in mod_python.c

[gr...@apache.org]

grisha      2002/09/27 10:59:00

  Modified:    .        configure configure.in
               src      Makefile.in mod_python.c
  Log:
  A small bug with the way a file extension is obtained and some other stuff.
  
  Revision  Changes    Path
  1.14      +3 -1      httpd-python/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/httpd-python/configure,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- configure	18 Aug 2002 18:43:36 -0000	1.13
  +++ configure	27 Sep 2002 17:59:00 -0000	1.14
  @@ -1163,7 +1163,7 @@
     echo "$ac_t""$ver" 1>&6
   
     # make version begins with 2
  -  if test -z "`echo $ver | egrep ^2`"; then
  +  if test -z "`echo $ver | egrep \^2`"; then
       { echo "configure: error: This version of mod_python only works with Apache 2. The one you have seems to be $ver." 1>&2; exit 1; }
     fi
   
  @@ -1489,6 +1489,8 @@
   # this for the test.py script
   
   TEST_SERVER_ROOT="`pwd`/test"
  +mkdir -p test/modules
  +mkdir -p test/logs
   ln -fs ../../src/mod_python.so test/modules/mod_python.so
   
   trap '' 1 2 15
  
  
  
  1.18      +3 -1      httpd-python/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-python/configure.in,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- configure.in	12 Sep 2002 18:24:05 -0000	1.17
  +++ configure.in	27 Sep 2002 17:59:00 -0000	1.18
  @@ -144,7 +144,7 @@
     AC_MSG_RESULT($ver)
   
     # make version begins with 2
  -  if test -z "`echo $ver | egrep ^2`"; then
  +  if test -z "`echo $ver | egrep \^2`"; then
       AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.])
     fi
   
  @@ -317,6 +317,8 @@
   # this for the test.py script
   AC_SUBST(TEST_SERVER_ROOT)
   TEST_SERVER_ROOT="`pwd`/test"
  +mkdir -p test/modules
  +mkdir -p test/logs
   ln -fs ../../src/mod_python.so test/modules/mod_python.so
   
   AC_OUTPUT(Makefile src/Makefile src/libpython.module Doc/Makefile test/testconf.py)
  
  
  
  1.18      +1 -1      httpd-python/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-python/src/Makefile.in,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Makefile.in	18 Sep 2002 20:15:29 -0000	1.17
  +++ Makefile.in	27 Sep 2002 17:59:00 -0000	1.18
  @@ -92,7 +92,7 @@
   	@echo 'Compiling for DSO. For static, do "make static"'
   	@echo
   	$(APXS) $(INCLUDES) -c $(SRCS) $(LDFLAGS) $(LIBS)
  -	ln -fs .libs/mod_python.so
  +	@ln -fs .libs/mod_python.so > /dev/null 2>&1
   	@echo
   	@echo 'Now su and make install'
   	@echo '  (or, if you only want to perform a partial install,'
  
  
  
  1.79      +7 -2      httpd-python/src/mod_python.c
  
  Index: mod_python.c
  ===================================================================
  RCS file: /home/cvs/httpd-python/src/mod_python.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- mod_python.c	24 Sep 2002 16:01:28 -0000	1.78
  +++ mod_python.c	27 Sep 2002 17:59:00 -0000	1.79
  @@ -817,7 +817,12 @@
                                                     &python_module);
       /* get file extension */
       if (req->filename) {        /* filename is null until after transhandler */
  -        ext = req->filename;
  +        /* get rid of preceeding path */
  +        if ((ext = ap_strrchr_c(req->filename, '/')) == NULL)
  +            ext = req->filename;
  +        else 
  +            ++ext;
  +        /* get extension */
           ap_getword(req->pool, &ext, '.');
           if (*ext != '\0')
               ext = apr_pstrcat(req->pool, ".", ext, NULL);