cvs commit: httpd-apreq-2/src apreq_parsers.c

[joes]

joes        2003/04/17 14:23:13

  Modified:    .        acinclude.m4
               env      Makefile.am
               src      apreq_parsers.c
  Log:
  Postpone contemplation of apreq_env_read().
  
  Revision  Changes    Path
  1.5       +3 -3      httpd-apreq-2/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- acinclude.m4      17 Apr 2003 19:19:39 -0000      1.4
  +++ acinclude.m4      17 Apr 2003 21:23:13 -0000      1.5
  @@ -3,9 +3,9 @@
                [  --with-apache2-apxs  path to apache2's apxs],
                [APACHE2_APXS=$withval],
                [APACHE2_APXS="/usr/local/apache2/bin/apxs"])
  -     APACHE2_INCLUDES="`$APACHE2_APXS -q INCLUDEDIR`"
  -        APACHE2_MODULES="`$APACHE2_APXS -q LIBEXECDIR`"
  -        APACHE2_LIBS="`$APACHE2_APXS -q LIBDIR`"
  +     APACHE2_INCLUDES=`$APACHE2_APXS -q INCLUDEDIR`
  +        APACHE2_MODULES=`$APACHE2_APXS -q LIBEXECDIR`
  +        APACHE2_LIBS=`$APACHE2_APXS -q LIBDIR`
           AC_SUBST(APACHE2_APXS)
        AC_SUBST(APACHE2_INCLUDES)
           AC_SUBST(APACHE2_MODULES)
  
  
  
  1.5       +1 -1      httpd-apreq-2/env/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/env/Makefile.am,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.am       17 Apr 2003 19:19:39 -0000      1.4
  +++ Makefile.am       17 Apr 2003 21:23:13 -0000      1.5
  @@ -4,7 +4,7 @@
   noinst_LTLIBRARIES = mod_apreq.la
   
   mod_apreq_la_SOURCES = mod_apreq.c
  -mod_apreq_la_LDFLAGS = -export-dynamic -module -rpath @APACHE2_MODULES@
  +mod_apreq_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath 
@APACHE2_MODULES@
   mod_apreq_la_LIBADD = ../src/libapreq.la
   
   libapreq_cgi_a_SOURCES = libapreq_cgi.c
  
  
  
  1.14      +0 -5      httpd-apreq-2/src/apreq_parsers.c
  
  Index: apreq_parsers.c
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/apreq_parsers.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- apreq_parsers.c   17 Apr 2003 19:19:39 -0000      1.13
  +++ apreq_parsers.c   17 Apr 2003 21:23:13 -0000      1.14
  @@ -136,11 +136,6 @@
   
       if (req->v.status == APR_INCOMPLETE) {
           apreq_parser_t *p = *(apreq_parser_t **)req->v.data;
  -        apr_status_t s = apreq_env_read();
  -
  -        if (bb = NULL) {
  -            apreq_env_read(req->env, &bb);
  -        }
           req->v.status = p->parser(req->pool, bb, p);
       }