httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r153661 - in httpd/apreq/branches/multi-env-unstable: ./ build/ env/ env/c-modules/ env/t/ include/ library/ library/t/ module/ module/apache2/ module/apache2/t/ module/apache2/t/apreq_access_test/ module/apache2/t/apreq_big_request_test/ module/apache2/t/apreq_cookie_test/ module/apache2/t/apreq_output_filter_test/ module/apache2/t/apreq_redirect_test/ module/apache2/t/apreq_request_test/ module/t/ module/t/cgi-bin/ module/t/conf/ src/ t/
Date Sun, 13 Feb 2005 20:43:54 GMT
Author: joes
Date: Sun Feb 13 12:43:46 2005
New Revision: 153661

URL: http://svn.apache.org/viewcvs?view=rev&rev=153661
Log:
Reorganize around include/, library/, and module/ dirs

Added:
    httpd/apreq/branches/multi-env-unstable/include/
    httpd/apreq/branches/multi-env-unstable/include/apreq.h
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env.h
    httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_cookie.h
    httpd/apreq/branches/multi-env-unstable/include/apreq_param.h
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_params.h
    httpd/apreq/branches/multi-env-unstable/include/apreq_parser.h
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.h
    httpd/apreq/branches/multi-env-unstable/include/apreq_util.h
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq.h
    httpd/apreq/branches/multi-env-unstable/include/apreq_version.h
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_version.h
    httpd/apreq/branches/multi-env-unstable/include/groups.dox.in
      - copied unchanged from r153633, httpd/apreq/branches/multi-env-unstable/src/groups.dox.in
    httpd/apreq/branches/multi-env-unstable/library/
    httpd/apreq/branches/multi-env-unstable/library/Makefile.am
      - copied, changed from r153640, httpd/apreq/branches/multi-env-unstable/src/Makefile.am
    httpd/apreq/branches/multi-env-unstable/library/cookie.c
      - copied unchanged from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_cookie.c
    httpd/apreq/branches/multi-env-unstable/library/module.c
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env.c
    httpd/apreq/branches/multi-env-unstable/library/module_cgi.c
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env_cgi.c
    httpd/apreq/branches/multi-env-unstable/library/module_custom.c
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env_custom.c
    httpd/apreq/branches/multi-env-unstable/library/param.c
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_params.c
    httpd/apreq/branches/multi-env-unstable/library/parser.c
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.c
    httpd/apreq/branches/multi-env-unstable/library/t/
      - copied from r153640, httpd/apreq/branches/multi-env-unstable/t/
    httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am
      - copied, changed from r153660, httpd/apreq/branches/multi-env-unstable/t/Makefile.am
    httpd/apreq/branches/multi-env-unstable/library/t/at.c
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/t/at.c
    httpd/apreq/branches/multi-env-unstable/library/t/at.h
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/t/at.h
    httpd/apreq/branches/multi-env-unstable/library/t/cookie.c
      - copied, changed from r153660, httpd/apreq/branches/multi-env-unstable/t/cookie.c
    httpd/apreq/branches/multi-env-unstable/library/t/params.c
      - copied, changed from r153660, httpd/apreq/branches/multi-env-unstable/t/params.c
    httpd/apreq/branches/multi-env-unstable/library/t/parsers.c
      - copied, changed from r153660, httpd/apreq/branches/multi-env-unstable/t/parsers.c
    httpd/apreq/branches/multi-env-unstable/library/t/performance.c
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/t/performance.c
    httpd/apreq/branches/multi-env-unstable/library/t/tables.c
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/t/tables.c
    httpd/apreq/branches/multi-env-unstable/library/t/version.c
      - copied, changed from r153660, httpd/apreq/branches/multi-env-unstable/t/version.c
    httpd/apreq/branches/multi-env-unstable/library/util.c
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq.c
    httpd/apreq/branches/multi-env-unstable/library/version.c
      - copied unchanged from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_version.c
    httpd/apreq/branches/multi-env-unstable/module/
    httpd/apreq/branches/multi-env-unstable/module/Makefile.am
      - copied, changed from r153640, httpd/apreq/branches/multi-env-unstable/env/Makefile.am
    httpd/apreq/branches/multi-env-unstable/module/apache2/
    httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_module_apache2.h
      - copied unchanged from r153633, httpd/apreq/branches/multi-env-unstable/env/apreq_env_apache2.h
    httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c
      - copied, changed from r153633, httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/
      - copied from r153640, httpd/apreq/branches/multi-env-unstable/env/c-modules/
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_access_test/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/c-modules/apreq_access_test/
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_big_request_test/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/c-modules/apreq_big_request_test/
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_cookie_test/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/c-modules/apreq_cookie_test/
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_output_filter_test/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/c-modules/apreq_output_filter_test/
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_redirect_test/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/c-modules/apreq_redirect_test/
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_request_test/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/c-modules/apreq_request_test/
    httpd/apreq/branches/multi-env-unstable/module/t/
      - copied from r153633, httpd/apreq/branches/multi-env-unstable/env/t/
    httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL
      - copied, changed from r153660, httpd/apreq/branches/multi-env-unstable/env/t/TEST.PL
    httpd/apreq/branches/multi-env-unstable/module/t/big_request.t
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/env/t/big_request.t
    httpd/apreq/branches/multi-env-unstable/module/t/cgi-bin/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/t/cgi-bin/
    httpd/apreq/branches/multi-env-unstable/module/t/cgi.t
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/env/t/cgi.t
    httpd/apreq/branches/multi-env-unstable/module/t/conf/
      - copied from r153660, httpd/apreq/branches/multi-env-unstable/env/t/conf/
    httpd/apreq/branches/multi-env-unstable/module/t/cookie.t
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/env/t/cookie.t
    httpd/apreq/branches/multi-env-unstable/module/t/request.t
      - copied unchanged from r153660, httpd/apreq/branches/multi-env-unstable/env/t/request.t
    httpd/apreq/branches/multi-env-unstable/module/test_cgi.c
      - copied, changed from r153640, httpd/apreq/branches/multi-env-unstable/env/test_cgi.c
Removed:
    httpd/apreq/branches/multi-env-unstable/env/Makefile.am
    httpd/apreq/branches/multi-env-unstable/env/apreq_env_apache2.h
    httpd/apreq/branches/multi-env-unstable/env/c-modules/
    httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c
    httpd/apreq/branches/multi-env-unstable/env/t/
    httpd/apreq/branches/multi-env-unstable/env/test_cgi.c
    httpd/apreq/branches/multi-env-unstable/src/Makefile.am
    httpd/apreq/branches/multi-env-unstable/src/apreq.c
    httpd/apreq/branches/multi-env-unstable/src/apreq.h
    httpd/apreq/branches/multi-env-unstable/src/apreq_cookie.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_cookie.h
    httpd/apreq/branches/multi-env-unstable/src/apreq_env.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_env.h
    httpd/apreq/branches/multi-env-unstable/src/apreq_env_cgi.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_env_custom.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_params.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_params.h
    httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.h
    httpd/apreq/branches/multi-env-unstable/src/apreq_tables.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_tables.h
    httpd/apreq/branches/multi-env-unstable/src/apreq_version.c
    httpd/apreq/branches/multi-env-unstable/src/apreq_version.h
    httpd/apreq/branches/multi-env-unstable/src/groups.dox.in
    httpd/apreq/branches/multi-env-unstable/t/
Modified:
    httpd/apreq/branches/multi-env-unstable/CHANGES
    httpd/apreq/branches/multi-env-unstable/Makefile.am
    httpd/apreq/branches/multi-env-unstable/STATUS
    httpd/apreq/branches/multi-env-unstable/acinclude.m4
    httpd/apreq/branches/multi-env-unstable/build/xsbuilder.pl
    httpd/apreq/branches/multi-env-unstable/configure.ac
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_access_test/mod_apreq_access_test.c
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_big_request_test/mod_apreq_big_request_test.c
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_cookie_test/mod_apreq_cookie_test.c
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_output_filter_test/mod_apreq_output_filter_test.c
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_redirect_test/mod_apreq_redirect_test.c
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_request_test/mod_apreq_request_test.c

Modified: httpd/apreq/branches/multi-env-unstable/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/CHANGES?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/CHANGES (original)
+++ httpd/apreq/branches/multi-env-unstable/CHANGES Sun Feb 13 12:43:46 2005
@@ -5,6 +5,9 @@
 @section v2_05 Changes with libapreq2-2.05
 
 
+- C API [joes]
+  Reorganize around include/, library/, and module/ dirs.
+
 - C Tests [joes]
   Replace CuTest-based tests with custom TAP-compliant framework.
 

Modified: httpd/apreq/branches/multi-env-unstable/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/Makefile.am?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/Makefile.am (original)
+++ httpd/apreq/branches/multi-env-unstable/Makefile.am Sun Feb 13 12:43:46 2005
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src env glue t
+SUBDIRS = library module glue
 EXTRA_DIST = LICENSE NOTICE README INSTALL CHANGES FAQ.pod MANIFEST.SKIP Makefile.PL buildconf
build win32 docs
 APU_SRCDIR=`@APU_CONFIG@ --srcdir`
 APR_SRCDIR=`@APR_CONFIG@ --srcdir`
@@ -78,13 +78,13 @@
 	-mkdir docs
 	echo GENERATE_TAGFILE=`pwd`/docs/apr.tag | $(APR_DOX)
 
-test: all lib_test env_test $(PERL_TEST)
+test: all library_test module_test $(PERL_TEST)
 
-env_test:
-	cd env; $(MAKE) test
+module_test:
+	cd module; $(MAKE) test
 
-lib_test:
-	cd t; $(MAKE) test
+library_test:
+	cd library; $(MAKE) test
 
 perl_install:
 	cd glue/perl; $(MAKE) install

Modified: httpd/apreq/branches/multi-env-unstable/STATUS
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/STATUS?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/STATUS (original)
+++ httpd/apreq/branches/multi-env-unstable/STATUS Sun Feb 13 12:43:46 2005
@@ -30,8 +30,6 @@
 RELEASE SHOWSTOPPERS:
 
     - The api docs and perl glue are currently broken.
-    - Remove all "_env" tags, renaming apreq_env.h to apreq.h and 
-      moving the original to apreq_util.h.
     - Improve the APREQ_ERROR related code.
     - Improve the custom & cgi module code.
 

Modified: httpd/apreq/branches/multi-env-unstable/acinclude.m4
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/acinclude.m4?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/acinclude.m4 (original)
+++ httpd/apreq/branches/multi-env-unstable/acinclude.m4 Sun Feb 13 12:43:46 2005
@@ -185,7 +185,7 @@
         fi
 
         get_version="$abs_srcdir/build/get-version.sh"
-        version_hdr="$abs_srcdir/src/apreq_version.h"
+        version_hdr="$abs_srcdir/include/apreq_version.h"
 
         # set version data
 

Modified: httpd/apreq/branches/multi-env-unstable/build/xsbuilder.pl
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/build/xsbuilder.pl?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/build/xsbuilder.pl (original)
+++ httpd/apreq/branches/multi-env-unstable/build/xsbuilder.pl Sun Feb 13 12:43:46 2005
@@ -20,7 +20,7 @@
 
 $cwd =~ m{^(.+)/glue/perl$} or die "Can't find base directory";
 my $base_dir = $1;
-my $src_dir = "$base_dir/src";
+my $src_dir = "$base_dir/include";
 my $xs_dir = "$base_dir/glue/perl/xsbuilder";
 
 sub slurp($$)
@@ -114,9 +114,9 @@
     # ExtUtils::XSBuilder::C::grammar
 
     for ($_[1]) {
-        ::c_macro("APREQ_DECLARE", "apreq.h")->();
-        ::c_macro("APREQ_DECLARE_HOOK", "apreq_parsers.h")->();
-        ::c_macro("APREQ_DECLARE_PARSER", "apreq_parsers.h")->();
+        ::c_macro("APREQ_DECLARE", "apreq_util.h")->();
+        ::c_macro("APREQ_DECLARE_HOOK", "apreq_parser.h")->();
+        ::c_macro("APREQ_DECLARE_PARSER", "apreq_parser.h")->();
         ::c_macro("APR_DECLARE")->();
         ::c_macro("XS")-> ();
     }

Modified: httpd/apreq/branches/multi-env-unstable/configure.ac
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/configure.ac?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/configure.ac (original)
+++ httpd/apreq/branches/multi-env-unstable/configure.ac Sun Feb 13 12:43:46 2005
@@ -27,12 +27,12 @@
 AM_MAINTAINER_MODE
 
 dnl Checks for header files.
-AM_CONFIG_HEADER(src/apreq_config.h)
+AM_CONFIG_HEADER(include/apreq_config.h)
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl Checks for library functions.
 
 AC_APREQ
-AC_CONFIG_FILES([Makefile src/Makefile env/Makefile glue/Makefile t/Makefile])
-AC_CONFIG_FILES([build/doxygen.conf src/groups.dox])
+AC_CONFIG_FILES([Makefile library/Makefile library/t/Makefile module/Makefile module/apache2/Makefile
glue/Makefile])
+AC_CONFIG_FILES([build/doxygen.conf include/groups.dox])
 AC_CONFIG_FILES([apreq2-config], [chmod +x apreq2-config])
 AC_OUTPUT

Copied: httpd/apreq/branches/multi-env-unstable/include/apreq.h (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env.h)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq.h?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_env.h&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/include/apreq.h&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_env.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq.h Sun Feb 13 12:43:46 2005
@@ -14,12 +14,12 @@
 **  limitations under the License.
 */
 
-#ifndef APREQ_ENV_H
-#define APREQ_ENV_H
+#ifndef APREQ_H
+#define APREQ_H
 
-#include "apreq_params.h"
 #include "apreq_cookie.h"
-#include "apreq_parsers.h"
+#include "apreq_param.h"
+#include "apreq_parser.h"
 
 #ifdef  __cplusplus
  extern "C" {
@@ -340,4 +340,4 @@
  }
 #endif
 
-#endif
+#endif /* APREQ_H */

Copied: httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_cookie.h)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_cookie.h&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_cookie.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h Sun Feb 13 12:43:46 2005
@@ -17,7 +17,7 @@
 #ifndef APREQ_COOKIE_H
 #define APREQ_COOKIE_H
 
-#include "apreq.h"
+#include "apreq_util.h"
 #include "apr_tables.h"
 
 #ifdef  __cplusplus

Copied: httpd/apreq/branches/multi-env-unstable/include/apreq_param.h (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_params.h)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq_param.h?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_params.h&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/include/apreq_param.h&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_params.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq_param.h Sun Feb 13 12:43:46 2005
@@ -14,10 +14,10 @@
 **  limitations under the License.
 */
 
-#ifndef APREQ_PARAMS_H
-#define APREQ_PARAMS_H
+#ifndef APREQ_PARAM_H
+#define APREQ_PARAM_H
 
-#include "apreq.h"
+#include "apreq_util.h"
 
 #ifdef __cplusplus
 extern "C" {

Copied: httpd/apreq/branches/multi-env-unstable/include/apreq_parser.h (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.h)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq_parser.h?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.h&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/include/apreq_parser.h&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq_parser.h Sun Feb 13 12:43:46 2005
@@ -1,6 +1,24 @@
+/*
+**  Copyright 2003-2004  The Apache Software Foundation
+**
+**  Licensed under the Apache License, Version 2.0 (the "License");
+**  you may not use this file except in compliance with the License.
+**  You may obtain a copy of the License at
+**
+**      http://www.apache.org/licenses/LICENSE-2.0
+**
+**  Unless required by applicable law or agreed to in writing, software
+**  distributed under the License is distributed on an "AS IS" BASIS,
+**  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+**  See the License for the specific language governing permissions and
+**  limitations under the License.
+*/
+
 #ifndef APREQ_PARSERS_H
 #define APREQ_PARSERS_H
 /* These structs are defined below */
+
+#include "apreq_param.h"
 
 #ifdef __cplusplus
 extern "C" {

Copied: httpd/apreq/branches/multi-env-unstable/include/apreq_util.h (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq.h)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq_util.h?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq.h&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/include/apreq_util.h&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq_util.h Sun Feb 13 12:43:46 2005
@@ -14,8 +14,8 @@
 **  limitations under the License.
 */
 
-#ifndef APREQ_H
-#define APREQ_H
+#ifndef APREQ_UTIL_H
+#define APREQ_UTIL_H
 
 #include "apr_tables.h" 
 #include "apr_file_io.h"
@@ -431,4 +431,4 @@
  }
 #endif
 
-#endif /* APREQ_H */
+#endif /* APREQ_UTIL_H */

Copied: httpd/apreq/branches/multi-env-unstable/include/apreq_version.h (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_version.h)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq_version.h?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_version.h&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/include/apreq_version.h&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_version.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq_version.h Sun Feb 13 12:43:46 2005
@@ -21,8 +21,8 @@
 extern "C" {
 #endif
 
-#include "apreq.h"
 #include "apr_version.h"
+#include "apreq_util.h"
 
 /**
  * @file apreq_version.h

Copied: httpd/apreq/branches/multi-env-unstable/library/Makefile.am (from r153640, httpd/apreq/branches/multi-env-unstable/src/Makefile.am)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/Makefile.am?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/Makefile.am&r1=153640&p2=httpd/apreq/branches/multi-env-unstable/library/Makefile.am&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/Makefile.am (original)
+++ httpd/apreq/branches/multi-env-unstable/library/Makefile.am Sun Feb 13 12:43:46 2005
@@ -1,17 +1,16 @@
-INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
+INCLUDES =  -I../include @APR_INCLUDES@ @APU_INCLUDES@
 LIBS = @APR_LTLIBS@ @APU_LTLIBS@
 LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
-EXTRA_DIST = groups.dox.in
 BUILT_SOURCES= @APR_LA@ @APU_LA@
 lib_LTLIBRARIES = libapreq2.la
-libapreq2_la_SOURCES = apreq.c apreq_version.c apreq_cookie.c \
-	               apreq_env_custom.c apreq_env_cgi.c \
-                       apreq_params.c apreq_parsers.c apreq_env.c
-pkginclude_HEADERS = apreq.h apreq_version.h apreq_cookie.h \
-                  apreq_params.h  apreq_parsers.h apreq_env.h
+libapreq2_la_SOURCES = util.c version.c cookie.c param.c parser.c \
+	               module.c module_custom.c module_cgi.c
 libapreq2_la_LDFLAGS = -version-info @APREQ_LIBTOOL_VERSION@
 
 pkgincludedir = $(includedir)/@APREQ_LIBNAME@
+
+test:
+	cd t; $(MAKE) test
 
 if ENABLE_PROFILE
 

Copied: httpd/apreq/branches/multi-env-unstable/library/module.c (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/module.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_env.c&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/library/module.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_env.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/module.c Sun Feb 13 12:43:46 2005
@@ -14,10 +14,9 @@
 **  limitations under the License.
 */
 
-#include "apreq_env.h"
+#include "apreq.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
-#include "apr_env.h"
 #include "apr_file_io.h"
 
 

Copied: httpd/apreq/branches/multi-env-unstable/library/module_cgi.c (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env_cgi.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/module_cgi.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_env_cgi.c&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/library/module_cgi.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_env_cgi.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/module_cgi.c Sun Feb 13 12:43:46 2005
@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "apreq.h"
-#include "apreq_env.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
 #include "apr_env.h"

Copied: httpd/apreq/branches/multi-env-unstable/library/module_custom.c (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_env_custom.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/module_custom.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_env_custom.c&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/library/module_custom.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_env_custom.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/module_custom.c Sun Feb 13 12:43:46 2005
@@ -15,7 +15,7 @@
 */
 
 #include "apr_strings.h"
-#include "apreq_env.h"
+#include "apreq.h"
 
 #define READ_BYTES (64 * 1024)
 

Copied: httpd/apreq/branches/multi-env-unstable/library/param.c (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_params.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/param.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_params.c&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/library/param.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_params.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/param.c Sun Feb 13 12:43:46 2005
@@ -14,7 +14,7 @@
 **  limitations under the License.
 */
 
-#include "apreq_params.h"
+#include "apreq_param.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
 

Copied: httpd/apreq/branches/multi-env-unstable/library/parser.c (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/parser.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.c&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/library/parser.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq_parsers.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/parser.c Sun Feb 13 12:43:46 2005
@@ -14,8 +14,7 @@
 **  limitations under the License.
 */
 
-#include "apreq_params.h"
-#include "apreq_parsers.h"
+#include "apreq_parser.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
 #include "apr_strmatch.h"

Copied: httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am (from r153660, httpd/apreq/branches/multi-env-unstable/t/Makefile.am)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/t/Makefile.am&r1=153660&p2=httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/t/Makefile.am (original)
+++ httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am Sun Feb 13 12:43:46 2005
@@ -1,12 +1,12 @@
-INCLUDES = -I../src @APR_INCLUDES@ @APU_INCLUDES@
-LIBS = ../src/libapreq2.la @APR_LTLIBS@ @APU_LTLIBS@
+INCLUDES = -I../../include @APR_INCLUDES@ @APU_INCLUDES@
+LIBS = ../libapreq2.la @APR_LTLIBS@ @APU_LTLIBS@
 LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
 
-noinst_LIBRARIES = libapreq2_test.a
-libapreq2_test_a_SOURCES = at.h at.c
+noinst_LIBRARIES = libapache_test.a
+libapache_test_a_SOURCES = at.h at.c
 
 check_PROGRAMS = version cookie params parsers
-LDADD  = libapreq2_test.a
+LDADD  = libapache_test.a
 
 check_SCRIPTS = version.t cookie.t params.t parsers.t
 TESTS = $(check_SCRIPTS)

Copied: httpd/apreq/branches/multi-env-unstable/library/t/cookie.c (from r153660, httpd/apreq/branches/multi-env-unstable/t/cookie.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/t/cookie.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/t/cookie.c&r1=153660&p2=httpd/apreq/branches/multi-env-unstable/library/t/cookie.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/t/cookie.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/t/cookie.c Sun Feb 13 12:43:46 2005
@@ -14,9 +14,8 @@
 **  limitations under the License.
 */
 
-#include "apreq_env.h"
 #include "apr_strings.h"
-#include "apreq_cookie.h"
+#include "apreq.h"
 #include "at.h"
 
 static const char nscookies[] = "a=1; foo=bar; fl=left; fr=right;bad; "

Copied: httpd/apreq/branches/multi-env-unstable/library/t/params.c (from r153660, httpd/apreq/branches/multi-env-unstable/t/params.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/t/params.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/t/params.c&r1=153660&p2=httpd/apreq/branches/multi-env-unstable/library/t/params.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/t/params.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/t/params.c Sun Feb 13 12:43:46 2005
@@ -14,7 +14,7 @@
 **  limitations under the License.
 */
 
-#include "apreq_env.h"
+#include "apreq.h"
 #include "apr_strings.h"
 #include "at.h"
 

Copied: httpd/apreq/branches/multi-env-unstable/library/t/parsers.c (from r153660, httpd/apreq/branches/multi-env-unstable/t/parsers.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/t/parsers.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/t/parsers.c&r1=153660&p2=httpd/apreq/branches/multi-env-unstable/library/t/parsers.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/t/parsers.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/t/parsers.c Sun Feb 13 12:43:46 2005
@@ -14,7 +14,7 @@
 **  limitations under the License.
 */
 
-#include "apreq_env.h"
+#include "apreq.h"
 #include "apr_strings.h"
 #include "apr_xml.h"
 #include "at.h"

Copied: httpd/apreq/branches/multi-env-unstable/library/t/version.c (from r153660, httpd/apreq/branches/multi-env-unstable/t/version.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/t/version.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/t/version.c&r1=153660&p2=httpd/apreq/branches/multi-env-unstable/library/t/version.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/t/version.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/t/version.c Sun Feb 13 12:43:46 2005
@@ -14,7 +14,6 @@
 **  limitations under the License.
 */
 
-#include "apreq_env.h"
 #include "apreq_version.h"
 #include "at.h"
 

Copied: httpd/apreq/branches/multi-env-unstable/library/util.c (from r153633, httpd/apreq/branches/multi-env-unstable/src/apreq.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/util.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/src/apreq.c&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/library/util.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/src/apreq.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/util.c Sun Feb 13 12:43:46 2005
@@ -14,7 +14,7 @@
 **  limitations under the License.
 */
 
-#include "apreq.h"
+#include "apreq_util.h"
 #include "apr_time.h"
 #include "apr_strings.h"
 #include "apr_lib.h"

Copied: httpd/apreq/branches/multi-env-unstable/module/Makefile.am (from r153640, httpd/apreq/branches/multi-env-unstable/env/Makefile.am)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/Makefile.am?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/env/Makefile.am&r1=153640&p2=httpd/apreq/branches/multi-env-unstable/module/Makefile.am&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/env/Makefile.am (original)
+++ httpd/apreq/branches/multi-env-unstable/module/Makefile.am Sun Feb 13 12:43:46 2005
@@ -1,60 +1,19 @@
 INCLUDES = -I../src @APACHE2_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@
-LIBS = ../src/lib@APREQ_LIBNAME@.la @APR_LTLIBS@ @APU_LTLIBS@
+SUBDIRS = apache2
+LIBS = ../library/lib@APREQ_LIBNAME@.la @APR_LTLIBS@ @APU_LTLIBS@
 LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
 TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
 EXTRA_DIST = t c-modules
-pkgincludedir = $(includedir)/@APREQ_LIBNAME@
-pkginclude_HEADERS = apreq_env_apache2.h
-mod_apreq_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath `@APACHE2_APXS@ -q LIBEXECDIR`
 
-check_PROGRAMS = test_cgi
-
-if MAINTAINER_MODE
-    AM_CPPFLAGS= -DAP_HAVE_DESIGNATED_INITIALIZER
-endif
-
-if BUILD_HTTPD
-
-# mod_apreq.c needs to be built from httpd-2.X, e.g.
-#
-# % cd ../httpd-2.X;
-# % ./configure --with-module=filters:../httpd-apreq-2/env/mod_apreq.c ...
-#
-# See the INSTALL file for details.
-
-@APACHE2_HTTPD@:
-	cd @APACHE2_SRC@ && $(MAKE)
-
-all-local: @APACHE2_HTTPD@
-
-t/TEST : Makefile.am t/TEST.PL
-	@PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -httpd @APACHE2_HTTPD@
-
-else
-
-noinst_LTLIBRARIES = mod_apreq.la
-mod_apreq_la_SOURCES = mod_apreq.c
-
-install-exec-local: mod_apreq.la
-	@APACHE2_APXS@ -i -a -n apreq mod_apreq.la
-
-t/TEST : Makefile.am t/TEST.PL
-	@PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -apxs @APACHE2_APXS@
-
-endif
-
-if HAVE_APACHE_TEST
+noinst_PROGRAMS = test_cgi
 
 run_tests : t/TEST
 	-cp -f test_cgi t/cgi-bin
 	-cp -Rp .libs t
 	MAKE=$(MAKE) @PERL@ t/TEST
-else
-
-run_tests:
-	@echo "Apache::Test not available, skipping env/ tests."
 
-endif
+t/TEST : Makefile.am t/TEST.PL
+	@PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -apxs @APACHE2_APXS@
 
 test :: all check run_tests
 

Copied: httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c (from r153633, httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c&r1=153633&p2=httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c (original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c Sun Feb 13 12:43:46 2005
@@ -25,11 +25,7 @@
 #include "http_request.h"
 #include "apr_strings.h"
 
-#include "apreq.h"
-#include "apreq_env.h"
-#include "apreq_params.h"
-#include "apreq_cookie.h"
-#include "apreq_env_apache2.h"
+#include "apreq_module_apache2.h"
 
 static const char filter_name[] = "apreq";
 

Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_access_test/mod_apreq_access_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_access_test/mod_apreq_access_test.c?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_access_test/mod_apreq_access_test.c
(original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_access_test/mod_apreq_access_test.c
Sun Feb 13 12:43:46 2005
@@ -30,8 +30,7 @@
 #define APACHE_HTTPD_TEST_PER_DIR_CREATE create_access_config 
 
 #include "apache_httpd_test.h"
-#include "apreq_env.h"
-#include "apreq_env_apache2.h"
+#include "apreq_module_apache2.h"
 #include "httpd.h"
 #include "apr_strings.h"
 

Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_big_request_test/mod_apreq_big_request_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_big_request_test/mod_apreq_big_request_test.c?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_big_request_test/mod_apreq_big_request_test.c
(original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_big_request_test/mod_apreq_big_request_test.c
Sun Feb 13 12:43:46 2005
@@ -27,8 +27,7 @@
 #define APACHE_HTTPD_TEST_HANDLER apreq_big_request_test_handler
 
 #include "apache_httpd_test.h"
-#include "apreq_env.h"
-#include "apreq_env_apache2.h"
+#include "apreq_module_apache2.h"
 #include "httpd.h"
 
 static int dump_table(void *count, const char *key, const char *value)

Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_cookie_test/mod_apreq_cookie_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_cookie_test/mod_apreq_cookie_test.c?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_cookie_test/mod_apreq_cookie_test.c
(original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_cookie_test/mod_apreq_cookie_test.c
Sun Feb 13 12:43:46 2005
@@ -27,8 +27,7 @@
 #define APACHE_HTTPD_TEST_HANDLER apreq_cookie_test_handler
 
 #include "apache_httpd_test.h"
-#include "apreq_env.h"
-#include "apreq_env_apache2.h"
+#include "apreq_module_apache2.h"
 #include "httpd.h"
 #include <assert.h>
 

Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_output_filter_test/mod_apreq_output_filter_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_output_filter_test/mod_apreq_output_filter_test.c?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_output_filter_test/mod_apreq_output_filter_test.c
(original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_output_filter_test/mod_apreq_output_filter_test.c
Sun Feb 13 12:43:46 2005
@@ -25,9 +25,7 @@
 #endif
 
 #include "apache_httpd_test.h"
-#include "apreq_params.h"
-#include "apreq_env.h"
-#include "apreq_env_apache2.h"
+#include "apreq_module_apache2.h"
 #include "httpd.h"
 #include "util_filter.h"
 

Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_redirect_test/mod_apreq_redirect_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_redirect_test/mod_apreq_redirect_test.c?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_redirect_test/mod_apreq_redirect_test.c
(original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_redirect_test/mod_apreq_redirect_test.c
Sun Feb 13 12:43:46 2005
@@ -28,8 +28,7 @@
 #define APACHE_HTTPD_TEST_HANDLER apreq_redirect_test_handler
 
 #include "apache_httpd_test.h"
-#include "apreq_env.h"
-#include "apreq_env_apache2.h"
+#include "apreq_module_apache2.h"
 #include "httpd.h"
 
 static int apreq_redirect_test_handler(request_rec *r)

Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_request_test/mod_apreq_request_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_request_test/mod_apreq_request_test.c?view=diff&r1=153660&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_request_test/mod_apreq_request_test.c
(original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/t/apreq_request_test/mod_apreq_request_test.c
Sun Feb 13 12:43:46 2005
@@ -28,8 +28,7 @@
 #define APACHE_HTTPD_TEST_HANDLER apreq_request_test_handler
 
 #include "apache_httpd_test.h"
-#include "apreq_env.h"
-#include "apreq_env_apache2.h"
+#include "apreq_module_apache2.h"
 #include "httpd.h"
 
 static int dump_table(void *ctx, const char *key, const char *value)

Copied: httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL (from r153660, httpd/apreq/branches/multi-env-unstable/env/t/TEST.PL)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/env/t/TEST.PL&r1=153660&p2=httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/env/t/TEST.PL (original)
+++ httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL Sun Feb 13 12:43:46 2005
@@ -6,11 +6,11 @@
 use Cwd;
 my $cwd = WIN32 ?
     Win32::GetLongPathName(cwd) : cwd;
-$cwd =~ m{^(.+)/env$} or die "Can't find base directory";
+$cwd =~ m{^(.+)/module$} or die "Can't find base directory";
 my $base_dir = $1;
-my $env_dir = "$base_dir/env";
-my $env_dir_libs = WIN32 ?
-    "$base_dir/win32/libs" : "$env_dir/.libs";
+my $module_dir = "$base_dir/module";
+my $mod_apreq2_dir = WIN32 ?
+    "$base_dir/win32/libs" : "$module_dir/apache2/.libs";
 
 use base 'Apache::TestRun';
 $Apache::TestTrace::Level = 'debug';
@@ -18,8 +18,9 @@
 
 sub pre_configure {
     my $self = shift;
-    # Don't load an installed mod_apreq
+    # Don't load an installed mod_apreq*
     Apache::TestConfig::autoconfig_skip_module_add('mod_apreq.c');
+    Apache::TestConfig::autoconfig_skip_module_add('mod_apreq2.c');
 }
 
 sub configure {
@@ -27,10 +28,10 @@
     my $cfg = $self->{test_config};
     # make sure Win32 uses the just-built libapreq2.dll
     if (WIN32) {
-        $cfg->preamble(qq{LoadFile "$env_dir_libs/libapreq2.dll"\n});
+        $cfg->preamble(qq{LoadFile "$mod_apreq2_dir/libapreq2.dll"\n});
     }
-    $cfg->preamble(IfModule => '!mod_apreq.c',
-               qq(LoadModule apreq_module "$env_dir_libs/mod_apreq.so"\n));
+    $cfg->preamble(IfModule => '!mod_apreq2.c',
+               qq(LoadModule apreq_module "$mod_apreq2_dir/mod_apreq2.so"\n));
     bless $cfg, "My::TestConfig";
     $self->SUPER::configure();
 }
@@ -45,6 +46,11 @@
 
 use base 'Apache::TestConfig';
 
+sub cmodules_configure {
+    my $self = shift;
+    my $dir = "$module_dir/apache2/t";
+    $self->SUPER::cmodules_configure($dir);
+}
 sub cmodules_httpd_conf {
     my $self = shift;
     debug "WRITING httpd.conf with " . join", ",map $_->{name},
@@ -66,14 +72,14 @@
         require File::Spec;
         my @goners = map {$name . '.' . $_} qw(exp ilk lib pdb so lo);
         my $libs = join ' ', 
-            (map {'-l' . File::Spec->catfile($env_dir_libs, $_)}
+            (map {'-l' . File::Spec->catfile($mod_apreq2_dir, $_)}
               qw(libapreq2.lib mod_apreq.lib));
         print $fh <<EOF;
 APXS=$self->{APXS}
 all: $lib
 
 $lib: $name.c
-        \$(APXS) -I../.. -I../../../src $libs -llibhttpd $dversion -p -I$self->{cmodules_dir}
-c $name.c
+        \$(APXS) -I../.. -I../../../../include $libs -llibhttpd $dversion -p -I$self->{cmodules_dir}
-c $name.c
 
 clean:
 	-erase @goners vc60.pdb 
@@ -85,7 +91,7 @@
 all: $lib
 
 $lib: $name.c
-	\$(APXS) -L../../../src -I../.. -I../../../src -lapreq2 $dversion -I$self->{cmodules_dir}
-c $name.c
+	\$(APXS) -L../../../../library -I../.. -I../../../../include -lapreq2 $dversion -I$self->{cmodules_dir}
-c $name.c
 
 clean:
 	-rm -rf $name.o $name.lo $name.slo $name.la .libs

Copied: httpd/apreq/branches/multi-env-unstable/module/test_cgi.c (from r153640, httpd/apreq/branches/multi-env-unstable/env/test_cgi.c)
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/test_cgi.c?view=diff&rev=153661&p1=httpd/apreq/branches/multi-env-unstable/env/test_cgi.c&r1=153640&p2=httpd/apreq/branches/multi-env-unstable/module/test_cgi.c&r2=153661
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/env/test_cgi.c (original)
+++ httpd/apreq/branches/multi-env-unstable/module/test_cgi.c Sun Feb 13 12:43:46 2005
@@ -15,7 +15,6 @@
 */
 
 #include "apreq.h"
-#include "apreq_env.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
 #include "apr_tables.h"



Mime
View raw message