Finalize the build environment by integrating the last thing (the

lex/yacc stuff) into Makefile.in and getting rid of the old Apache 1.3
Makefile.tmpl file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89009 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/Makefile.in b/modules/ssl/Makefile.in
index 2207d48f3c4e55d650cb3bf70ad9172f475de745..ca76b7bd0e38dcfc3228c8a46278e458e2a20dcc 100644 (file)
--- a/modules/ssl/Makefile.in
+++ b/modules/ssl/Makefile.in
@@ -46,5 +46,26 @@
 ## SUCH DAMAGE.
 ## ====================================================================
 
+#
+#   standard stuff
+#
+
 include $(top_srcdir)/build/special.mk
 
+#
+#   developer stuff
+#   (we really don't expect end users to use these targets!)
+#
+
+ssl_expr_scan.c: ssl_expr_scan.l ssl_expr_parse.h
+       flex -Pssl_expr_yy -s -B ssl_expr_scan.l
+       sed -e '/$$Header:/d' <lex.ssl_expr_yy.c >ssl_expr_scan.c && rm -f lex.ssl_expr_yy.c
+
+ssl_expr_parse.c ssl_expr_parse.h: ssl_expr_parse.y
+       yacc -d ssl_expr_parse.y
+       sed -e 's;yy;ssl_expr_yy;g' \
+           -e '/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d' \
+           <y.tab.c >ssl_expr_parse.c && rm -f y.tab.c
+       sed -e 's;yy;ssl_expr_yy;g' \
+           <y.tab.h >ssl_expr_parse.h && rm -f y.tab.h
+

diff --git a/modules/ssl/Makefile.tmpl b/modules/ssl/Makefile.tmpl
deleted file mode 100644 (file)
index 4d118a1..0000000
--- a/modules/ssl/Makefile.tmpl
+++ /dev/null
@@ -1,528 +0,0 @@
-##                      _             _ 
-##  _ __ ___   ___   __| |    ___ ___| |  mod_ssl
-## | '_ ` _ \ / _ \ / _` |   / __/ __| |  Apache Interface to OpenSSL
-## | | | | | | (_) | (_| |   \__ \__ \ |  www.modssl.org
-## |_| |_| |_|\___/ \__,_|___|___/___/_|  ftp.modssl.org
-##                      |_____|         
-##  Makefile.tmpl 
-##  Apache 1.3 Makefile template for SSL module (Unix environment)
-##
-
-##
-## ====================================================================
-## The Apache Software License, Version 1.1
-##
-## Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
-## reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions
-## are met:
-##
-## 1. Redistributions of source code must retain the above copyright
-##    notice, this list of conditions and the following disclaimer.
-##
-## 2. Redistributions in binary form must reproduce the above copyright
-##    notice, this list of conditions and the following disclaimer in
-##    the documentation and/or other materials provided with the
-##    distribution.
-##
-## 3. The end-user documentation included with the redistribution,
-##    if any, must include the following acknowledgment:
-##       "This product includes software developed by the
-##        Apache Software Foundation (http://www.apache.org/)."
-##    Alternately, this acknowledgment may appear in the software itself,
-##    if and wherever such third-party acknowledgments normally appear.
-##
-## 4. The names "Apache" and "Apache Software Foundation" must
-##    not be used to endorse or promote products derived from this
-##    software without prior written permission. For written
-##    permission, please contact apache@apache.org.
-##
-## 5. Products derived from this software may not be called "Apache",
-##    nor may "Apache" appear in their name, without prior written
-##    permission of the Apache Software Foundation.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-## DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-## ====================================================================
-##
-                             #
-                             # ``I cannot write a program which is
-                             #   as popular as one from Larry Wall.
-                             #   But I can write one which is from me.''
-                             #                     -- RSE
-
-LIB=libssl.$(LIBEXT)
-
-OBJS=\
- mod_ssl.o\
- ssl_engine_config.o\
- ssl_engine_compat.o\
- ssl_engine_ds.o\
- ssl_engine_dh.o\
- ssl_engine_init.o\
- ssl_engine_kernel.o\
- ssl_engine_rand.o\
- ssl_engine_io.o\
- ssl_engine_log.o\
- ssl_engine_mutex.o\
- ssl_engine_pphrase.o\
- ssl_engine_vars.o\
- ssl_engine_ext.o\
- ssl_scache.o\
- ssl_scache_dbm.o\
- ssl_scache_shmht.o\
- ssl_scache_shmcb.o\
- ssl_expr.o\
- ssl_expr_scan.o\
- ssl_expr_parse.o\
- ssl_expr_eval.o\
- ssl_util.o\
- ssl_util_ssl.o\
- ssl_util_sdbm.o\
- ssl_util_table.o\
- $(SSL_VENDOR_OBJS)
-
-OBJS_PIC=\
- mod_ssl.lo\
- ssl_engine_config.lo\
- ssl_engine_compat.lo\
- ssl_engine_ds.lo\
- ssl_engine_dh.lo\
- ssl_engine_init.lo\
- ssl_engine_kernel.lo\
- ssl_engine_rand.lo\
- ssl_engine_io.lo\
- ssl_engine_log.lo\
- ssl_engine_mutex.lo\
- ssl_engine_pphrase.lo\
- ssl_engine_vars.lo\
- ssl_engine_ext.lo\
- ssl_scache.lo\
- ssl_scache_dbm.lo\
- ssl_scache_shmht.lo\
- ssl_scache_shmcb.lo\
- ssl_expr.lo\
- ssl_expr_scan.lo\
- ssl_expr_parse.lo\
- ssl_expr_eval.lo\
- ssl_util.lo\
- ssl_util_ssl.lo\
- ssl_util_sdbm.lo\
- ssl_util_table.lo\
- $(SSL_VENDOR_OBJS_PIC)
-
-##
-##  END-USER AREA
-##
-
-all: lib
-
-lib: $(LIB)
-
-libssl.a: $(OBJS)
-       rm -f $@
-       ar cr $@ $(OBJS)
-       $(RANLIB) $@
-
-libssl.so: $(OBJS_PIC)
-       rm -f $@
-       $(LD_SHLIB) $(SSL_LDFLAGS) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC) $(SSL_LIBS) $(LIBS_SHLIB) 
-
-.SUFFIXES: .o .lo
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) $(SSL_VERSION) $<
-
-.c.lo:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SSL_CFLAGS) $(SSL_VERSION) $< && mv $*.o $*.lo
-
-clean:
-       rm -f $(OBJS) $(OBJS_PIC) 
-       rm -f libssl.a libssl.so
-
-realclean: clean
-       rm -f ssl_expr_parse.c ssl_expr_parse.h
-       rm -f ssl_expr_scan.c
-
-distclean: clean
-       -rm -f Makefile
-
-##
-##  DEVELOPER AREA
-##  We really don't expect end users to use these targets!
-##
-
-ssl_expr_scan.c: ssl_expr_scan.l ssl_expr_parse.h
-       flex -Pssl_expr_yy -s -B ssl_expr_scan.l
-       sed -e '/$$Header:/d' <lex.ssl_expr_yy.c >ssl_expr_scan.c && rm -f lex.ssl_expr_yy.c
-
-ssl_expr_parse.c ssl_expr_parse.h: ssl_expr_parse.y
-       yacc -d ssl_expr_parse.y
-       sed -e 's;yy;ssl_expr_yy;g' \
-           -e '/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d' \
-           <y.tab.c >ssl_expr_parse.c && rm -f y.tab.c
-       sed -e 's;yy;ssl_expr_yy;g' \
-           <y.tab.h >ssl_expr_parse.h && rm -f y.tab.h
-
-nocons:
-       @$(MAKE) $(MFLAGS) $(MFLAGS_STATIC) \
-            SSL_CFLAGS="`echo $(SSL_CFLAGS) |\
-            sed -e 's;-DSSL_CONSERVATIVE;;'`" all
-
-cons:
-       @$(MAKE) $(MFLAGS) $(MFLAGS_STATIC) \
-            SSL_CFLAGS="`echo $(SSL_CFLAGS) |\
-            sed -e 's;-DSSL_CONSERVATIVE;;' \
-                -e 's;^;-DSSL_CONSERVATIVE ;'`" all
-noexp:
-       @$(MAKE) $(MFLAGS) $(MFLAGS_STATIC) \
-            SSL_CFLAGS="`echo $(SSL_CFLAGS) |\
-            sed -e 's;-DSSL_EXPERIMENTAL;;'`" all
-
-exp:
-       @$(MAKE) $(MFLAGS) $(MFLAGS_STATIC) \
-            SSL_CFLAGS="`echo $(SSL_CFLAGS) |\
-            sed -e 's;-DSSL_EXPERIMENTAL;;' \
-                -e 's;^;-DSSL_EXPERIMENTAL ;'`" all
-
-depend:
-       cp Makefile.tmpl Makefile.tmpl.bak \
-           && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
-           && gcc -MM $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) *.c >> Makefile.new \
-           && sed -e '1,$$s; $(INCDIR)/; $$(INCDIR)/;g' \
-                  -e '1,$$s; $(OSDIR)/; $$(OSDIR)/;g' \
-                  -e '1,$$s;^\([a-z0-9_]*\)\.o:;\1.o \1.lo:;g' Makefile.new \
-               > Makefile.tmpl \
-           && rm Makefile.new
-
-##
-##  DEPENDENCY AREA
-##
-
-$(OBJS) $(OBJS_PIC): Makefile
-
-# DO NOT REMOVE
-mod_ssl.o mod_ssl.lo: mod_ssl.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_compat.o ssl_engine_compat.lo: ssl_engine_compat.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_config.o ssl_engine_config.lo: ssl_engine_config.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_dh.o ssl_engine_dh.lo: ssl_engine_dh.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_ds.o ssl_engine_ds.lo: ssl_engine_ds.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_ext.o ssl_engine_ext.lo: ssl_engine_ext.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_init.o ssl_engine_init.lo: ssl_engine_init.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_io.o ssl_engine_io.lo: ssl_engine_io.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_kernel.o ssl_engine_kernel.lo: ssl_engine_kernel.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_log.o ssl_engine_log.lo: ssl_engine_log.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_mutex.o ssl_engine_mutex.lo: ssl_engine_mutex.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_pphrase.o ssl_engine_pphrase.lo: ssl_engine_pphrase.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_rand.o ssl_engine_rand.lo: ssl_engine_rand.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_engine_vars.o ssl_engine_vars.lo: ssl_engine_vars.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_expr.o ssl_expr.lo: ssl_expr.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_expr_eval.o ssl_expr_eval.lo: ssl_expr_eval.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_expr_parse.o ssl_expr_parse.lo: ssl_expr_parse.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_expr_scan.o ssl_expr_scan.lo: ssl_expr_scan.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h \
- ssl_expr_parse.h
-ssl_scache.o ssl_scache.lo: ssl_scache.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_scache_dbm.o ssl_scache_dbm.lo: ssl_scache_dbm.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_scache_shmcb.o ssl_scache_shmcb.lo: ssl_scache_shmcb.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_scache_shmht.o ssl_scache_shmht.lo: ssl_scache_shmht.c mod_ssl.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_util.o ssl_util.lo: ssl_util.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_util_sdbm.o ssl_util_sdbm.lo: ssl_util_sdbm.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_util_ssl.o ssl_util_ssl.lo: ssl_util_ssl.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_util_table.o ssl_util_table.lo: ssl_util_table.c ssl_util_table.h

diff --git a/modules/ssl/ssl_expr.h b/modules/ssl/ssl_expr.h
index 1c125aacb8fa6deefb798b228f654e9fcb7fb766..a17dfd0cb004e8ead21c7fdeaf0199998a2ea724 100644 (file)
--- a/modules/ssl/ssl_expr.h
+++ b/modules/ssl/ssl_expr.h
@@ -61,8 +61,6 @@
 #ifndef SSL_EXPR_H
 #define SSL_EXPR_H
 
-#if 0 /* XXX */
-
 #ifndef FALSE
 #define FALSE 0
 #endif
@@ -111,7 +109,7 @@ typedef struct {
 typedef ssl_expr_node ssl_expr;
 
 typedef struct {
-       pool     *pool;
+       apr_pool_t *pool;
     char     *inputbuf;
     int       inputlen;
     char     *inputptr;
@@ -129,12 +127,10 @@ extern int ssl_expr_yyparse(void);
 extern int ssl_expr_yyerror(char *);
 extern int ssl_expr_yylex(void);
 
-extern ssl_expr *ssl_expr_comp(pool *, char *);
+extern ssl_expr *ssl_expr_comp(apr_pool_t *, char *);
 extern int       ssl_expr_exec(request_rec *, ssl_expr *);
 extern char     *ssl_expr_get_error(void);
 extern ssl_expr *ssl_expr_make(ssl_expr_node_op, void *, void *);
 extern BOOL      ssl_expr_eval(request_rec *, ssl_expr *);
 
-#endif /* XXX */
-
 #endif /* SSL_EXPR_H */

diff --git a/modules/ssl/ssl_expr_parse.c b/modules/ssl/ssl_expr_parse.c
index 486ae6b3caec793641404a63a2c5ee67477711f2..2f9a013dd437e5864cca10e0fe4f710e2df5bd13 100644 (file)
--- a/modules/ssl/ssl_expr_parse.c
+++ b/modules/ssl/ssl_expr_parse.c
@@ -1,4 +1,3 @@
-#if 0 /* XXX */
 #ifndef lint
 static char const 
 ssl_expr_yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
@@ -14,9 +13,9 @@ ssl_expr_yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02
 #define YYRECOVERING() (ssl_expr_yyerrflag!=0)
 static int ssl_expr_yygrowstack();
 #define YYPREFIX "ssl_expr_yy"
-#line 72 "ssl_expr_parse.y"
+#line 69 "ssl_expr_parse.y"
 #include "mod_ssl.h"
-#line 75 "ssl_expr_parse.y"
+#line 72 "ssl_expr_parse.y"
 typedef union {
     char     *cpVal;
     ssl_expr *exVal;
@@ -219,7 +218,7 @@ short *ssl_expr_yyss;
 short *ssl_expr_yysslim;
 YYSTYPE *ssl_expr_yyvs;
 int ssl_expr_yystacksize;
-#line 180 "ssl_expr_parse.y"
+#line 177 "ssl_expr_parse.y"
 
 int ssl_expr_yyerror(char *s)
 {
@@ -423,99 +422,99 @@ ssl_expr_yyreduce:
     switch (ssl_expr_yyn)
     {
 case 1:
-#line 118 "ssl_expr_parse.y"
+#line 115 "ssl_expr_parse.y"
 { ssl_expr_info.expr = ssl_expr_yyvsp[0].exVal; }
 break;
 case 2:
-#line 121 "ssl_expr_parse.y"
+#line 118 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_True,  NULL, NULL); }
 break;
 case 3:
-#line 122 "ssl_expr_parse.y"
+#line 119 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_False, NULL, NULL); }
 break;
 case 4:
-#line 123 "ssl_expr_parse.y"
+#line 120 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_Not,   ssl_expr_yyvsp[0].exVal,   NULL); }
 break;
 case 5:
-#line 124 "ssl_expr_parse.y"
+#line 121 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_Or,    ssl_expr_yyvsp[-2].exVal,   ssl_expr_yyvsp[0].exVal);   }
 break;
 case 6:
-#line 125 "ssl_expr_parse.y"
+#line 122 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_And,   ssl_expr_yyvsp[-2].exVal,   ssl_expr_yyvsp[0].exVal);   }
 break;
 case 7:
-#line 126 "ssl_expr_parse.y"
+#line 123 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_Comp,  ssl_expr_yyvsp[0].exVal,   NULL); }
 break;
 case 8:
-#line 127 "ssl_expr_parse.y"
+#line 124 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_yyvsp[-1].exVal; }
 break;
 case 9:
-#line 130 "ssl_expr_parse.y"
+#line 127 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_EQ,  ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 10:
-#line 131 "ssl_expr_parse.y"
+#line 128 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_NE,  ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 11:
-#line 132 "ssl_expr_parse.y"
+#line 129 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_LT,  ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 12:
-#line 133 "ssl_expr_parse.y"
+#line 130 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_LE,  ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 13:
-#line 134 "ssl_expr_parse.y"
+#line 131 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_GT,  ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 14:
-#line 135 "ssl_expr_parse.y"
+#line 132 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_GE,  ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 15:
-#line 136 "ssl_expr_parse.y"
+#line 133 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_IN,  ssl_expr_yyvsp[-4].exVal, ssl_expr_yyvsp[-1].exVal); }
 break;
 case 16:
-#line 137 "ssl_expr_parse.y"
+#line 134 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_REG, ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 17:
-#line 138 "ssl_expr_parse.y"
+#line 135 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_NRE, ssl_expr_yyvsp[-2].exVal, ssl_expr_yyvsp[0].exVal); }
 break;
 case 18:
-#line 141 "ssl_expr_parse.y"
+#line 138 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_ListElement, ssl_expr_yyvsp[0].exVal, NULL); }
 break;
 case 19:
-#line 142 "ssl_expr_parse.y"
+#line 139 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_ListElement, ssl_expr_yyvsp[0].exVal, ssl_expr_yyvsp[-2].exVal);   }
 break;
 case 20:
-#line 145 "ssl_expr_parse.y"
+#line 142 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_Digit,  ssl_expr_yyvsp[0].cpVal, NULL); }
 break;
 case 21:
-#line 146 "ssl_expr_parse.y"
+#line 143 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_String, ssl_expr_yyvsp[0].cpVal, NULL); }
 break;
 case 22:
-#line 147 "ssl_expr_parse.y"
+#line 144 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_make(op_Var,    ssl_expr_yyvsp[-1].cpVal, NULL); }
 break;
 case 23:
-#line 148 "ssl_expr_parse.y"
+#line 145 "ssl_expr_parse.y"
 { ssl_expr_yyval.exVal = ssl_expr_yyvsp[0].exVal; }
 break;
 case 24:
-#line 151 "ssl_expr_parse.y"
+#line 148 "ssl_expr_parse.y"
 { 
                 regex_t *regex;
                 if ((regex = ap_pregcomp(ssl_expr_info.pool, ssl_expr_yyvsp[0].cpVal, 
@@ -528,7 +527,7 @@ case 24:
             }
 break;
 case 25:
-#line 161 "ssl_expr_parse.y"
+#line 158 "ssl_expr_parse.y"
 {
                 regex_t *regex;
                 if ((regex = ap_pregcomp(ssl_expr_info.pool, ssl_expr_yyvsp[0].cpVal, 
@@ -541,7 +540,7 @@ case 25:
             }
 break;
 case 26:
-#line 173 "ssl_expr_parse.y"
+#line 170 "ssl_expr_parse.y"
 { 
                ssl_expr *args = ssl_expr_make(op_ListElement, ssl_expr_yyvsp[-1].cpVal, NULL);
                ssl_expr_yyval.exVal = ssl_expr_make(op_Func, "file", args);
@@ -604,4 +603,3 @@ ssl_expr_yyabort:
 ssl_expr_yyaccept:
     return (0);
 }
-#endif /* XXX */

diff --git a/modules/ssl/ssl_expr_parse.h b/modules/ssl/ssl_expr_parse.h
index a927935670976f3eab329cf9f12c0a55582959d7..618cacbe3bf45b318e4ef3f0c766722767195cce 100644 (file)
--- a/modules/ssl/ssl_expr_parse.h
+++ b/modules/ssl/ssl_expr_parse.h
@@ -1,4 +1,3 @@
-#if 0 /* XXX */
 #ifndef YYERRCODE
 #define YYERRCODE 256
 #endif
@@ -28,4 +27,3 @@ typedef union {
     ssl_expr *exVal;
 } YYSTYPE;
 extern YYSTYPE ssl_expr_yylval;
-#endif /* XXX */

diff --git a/modules/ssl/ssl_expr_parse.y b/modules/ssl/ssl_expr_parse.y
index 0fac606baea5e36d9d36ef08c30c876d21383f7f..c79e8c29409f29e40e1d1030689f3b268056f2cd 100644 (file)
--- a/modules/ssl/ssl_expr_parse.y
+++ b/modules/ssl/ssl_expr_parse.y
@@ -67,8 +67,6 @@
 
 %{
 #include "mod_ssl.h"
-
-#if 0 /* XXX */
 %}
 
 %union {
@@ -183,7 +181,3 @@ int yyerror(char *s)
     return 2;
 }
 
-%{
-#endif /* XXX */
-%}
-

diff --git a/modules/ssl/ssl_expr_scan.c b/modules/ssl/ssl_expr_scan.c
index b5f9d4a4f4a447d6f7702f0ea87c71d52ef28572..a2f29924e31935854fdebf767659d9e09a9deaa7 100644 (file)
--- a/modules/ssl/ssl_expr_scan.c
+++ b/modules/ssl/ssl_expr_scan.c
@@ -1,4 +1,3 @@
-#if 0 /* XXX */
 #define yy_create_buffer ssl_expr_yy_create_buffer
 #define yy_delete_buffer ssl_expr_yy_delete_buffer
 #define yy_scan_buffer ssl_expr_yy_scan_buffer
@@ -456,53 +455,51 @@ char *yytext;
 **  Expression Scanner
 */
 /* ====================================================================
- * Copyright (c) 1998-2001 Ralf S. Engelschall. All rights reserved.
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
+ * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following
- *    disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by 
- *     Ralf S. Engelschall <rse@engelschall.com> for use in the
- *     mod_ssl project (http://www.modssl.org/)."
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
  *
- * 4. The names "mod_ssl" must not be used to endorse or promote
- *    products derived from this software without prior written
- *    permission. For written permission, please contact
- *    rse@engelschall.com.
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
  *
- * 5. Products derived from this software may not be called "mod_ssl"
- *    nor may "mod_ssl" appear in their names without prior
- *    written permission of Ralf S. Engelschall.
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
  *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by 
- *     Ralf S. Engelschall <rse@engelschall.com> for use in the
- *     mod_ssl project (http://www.modssl.org/)."
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
  *
- * THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL RALF S. ENGELSCHALL OR
- * HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  * ====================================================================
  */
 /* ``Killing for peace is 
@@ -513,7 +510,7 @@ like fucking for virginity.''
 **  Expression Scanner
 **  _________________________________________________________________
 */
-#line 73 "ssl_expr_scan.l"
+#line 70 "ssl_expr_scan.l"
 #include "mod_ssl.h"
 
 #include "ssl_expr_parse.h"
@@ -533,7 +530,7 @@ int yyinput(char *buf, int max_size);
 #define regex 2
 #define regex_flags 3
 
-#line 537 "lex.ssl_expr_yy.c"
+#line 535 "lex.ssl_expr_yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -684,7 +681,7 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
 
-#line 94 "ssl_expr_scan.l"
+#line 91 "ssl_expr_scan.l"
 
   
   char  caStr[MAX_STR_LEN];
@@ -696,7 +693,7 @@ YY_DECL
  /*
   * Whitespaces
   */
-#line 700 "lex.ssl_expr_yy.c"
+#line 698 "lex.ssl_expr_yy.c"
 
        if ( yy_init )
                {
@@ -777,7 +774,7 @@ do_action:  /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 105 "ssl_expr_scan.l"
+#line 102 "ssl_expr_scan.l"
 { 
     /* NOP */
 }
@@ -787,7 +784,7 @@ YY_RULE_SETUP
   */
 case 2:
 YY_RULE_SETUP
-#line 112 "ssl_expr_scan.l"
+#line 109 "ssl_expr_scan.l"
 {
     cpStr = caStr;
     BEGIN(str);
@@ -795,24 +792,24 @@ YY_RULE_SETUP
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 116 "ssl_expr_scan.l"
+#line 113 "ssl_expr_scan.l"
 {
     BEGIN(INITIAL);
     *cpStr = NUL;
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caStr);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caStr);
     return T_STRING;
 }
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 122 "ssl_expr_scan.l"
+#line 119 "ssl_expr_scan.l"
 {
     yyerror("Unterminated string");
 }
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 125 "ssl_expr_scan.l"
+#line 122 "ssl_expr_scan.l"
 {
     int result;
 
@@ -825,46 +822,46 @@ YY_RULE_SETUP
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 134 "ssl_expr_scan.l"
+#line 131 "ssl_expr_scan.l"
 {
     yyerror("Bad escape sequence");
 }
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 137 "ssl_expr_scan.l"
+#line 134 "ssl_expr_scan.l"
 { *cpStr++ = '\n'; }
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 138 "ssl_expr_scan.l"
+#line 135 "ssl_expr_scan.l"
 { *cpStr++ = '\r'; }
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 139 "ssl_expr_scan.l"
+#line 136 "ssl_expr_scan.l"
 { *cpStr++ = '\t'; }
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 140 "ssl_expr_scan.l"
+#line 137 "ssl_expr_scan.l"
 { *cpStr++ = '\b'; }
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 141 "ssl_expr_scan.l"
+#line 138 "ssl_expr_scan.l"
 { *cpStr++ = '\f'; }
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 142 "ssl_expr_scan.l"
+#line 139 "ssl_expr_scan.l"
 {
     *cpStr++ = yytext[1];
 }
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 145 "ssl_expr_scan.l"
+#line 142 "ssl_expr_scan.l"
 {
     char *cp = yytext;
     while (*cp != NUL)
@@ -873,7 +870,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 150 "ssl_expr_scan.l"
+#line 147 "ssl_expr_scan.l"
 {
     *cpStr++ = yytext[1];
 }
@@ -883,7 +880,7 @@ YY_RULE_SETUP
   */
 case 15:
 YY_RULE_SETUP
-#line 157 "ssl_expr_scan.l"
+#line 154 "ssl_expr_scan.l"
 {
     cRegexDel = yytext[1];
     cpRegex = caRegex;
@@ -892,7 +889,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 162 "ssl_expr_scan.l"
+#line 159 "ssl_expr_scan.l"
 {
     if (yytext[0] == cRegexDel) {
         *cpRegex = NUL;
@@ -905,27 +902,27 @@ YY_RULE_SETUP
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 171 "ssl_expr_scan.l"
+#line 168 "ssl_expr_scan.l"
 {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caRegex);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
     BEGIN(INITIAL);
     return T_REGEX_I;
 }
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 176 "ssl_expr_scan.l"
+#line 173 "ssl_expr_scan.l"
 {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caRegex);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
     yyless(0);
     BEGIN(INITIAL);
     return T_REGEX;
 }
        YY_BREAK
 case YY_STATE_EOF(regex_flags):
-#line 182 "ssl_expr_scan.l"
+#line 179 "ssl_expr_scan.l"
 {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caRegex);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
     BEGIN(INITIAL);
     return T_REGEX;
 }
@@ -935,107 +932,107 @@ case YY_STATE_EOF(regex_flags):
   */
 case 19:
 YY_RULE_SETUP
-#line 191 "ssl_expr_scan.l"
+#line 188 "ssl_expr_scan.l"
 { return T_OP_EQ; }
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 192 "ssl_expr_scan.l"
+#line 189 "ssl_expr_scan.l"
 { return T_OP_EQ; }
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 193 "ssl_expr_scan.l"
+#line 190 "ssl_expr_scan.l"
 { return T_OP_NE; }
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 194 "ssl_expr_scan.l"
+#line 191 "ssl_expr_scan.l"
 { return T_OP_NE; }
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 195 "ssl_expr_scan.l"
+#line 192 "ssl_expr_scan.l"
 { return T_OP_LT; }
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 196 "ssl_expr_scan.l"
+#line 193 "ssl_expr_scan.l"
 { return T_OP_LT; }
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 197 "ssl_expr_scan.l"
+#line 194 "ssl_expr_scan.l"
 { return T_OP_LE; }
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 198 "ssl_expr_scan.l"
+#line 195 "ssl_expr_scan.l"
 { return T_OP_LE; }
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 199 "ssl_expr_scan.l"
+#line 196 "ssl_expr_scan.l"
 { return T_OP_GT; }
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 200 "ssl_expr_scan.l"
+#line 197 "ssl_expr_scan.l"
 { return T_OP_GT; }
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 201 "ssl_expr_scan.l"
+#line 198 "ssl_expr_scan.l"
 { return T_OP_GE; }
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 202 "ssl_expr_scan.l"
+#line 199 "ssl_expr_scan.l"
 { return T_OP_GE; }
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 203 "ssl_expr_scan.l"
+#line 200 "ssl_expr_scan.l"
 { return T_OP_REG; }
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 204 "ssl_expr_scan.l"
+#line 201 "ssl_expr_scan.l"
 { return T_OP_NRE; }
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 205 "ssl_expr_scan.l"
+#line 202 "ssl_expr_scan.l"
 { return T_OP_AND; }
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 206 "ssl_expr_scan.l"
+#line 203 "ssl_expr_scan.l"
 { return T_OP_AND; }
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 207 "ssl_expr_scan.l"
+#line 204 "ssl_expr_scan.l"
 { return T_OP_OR; }
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 208 "ssl_expr_scan.l"
+#line 205 "ssl_expr_scan.l"
 { return T_OP_OR; }
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 209 "ssl_expr_scan.l"
+#line 206 "ssl_expr_scan.l"
 { return T_OP_NOT; }
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 210 "ssl_expr_scan.l"
+#line 207 "ssl_expr_scan.l"
 { return T_OP_NOT; }
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 211 "ssl_expr_scan.l"
+#line 208 "ssl_expr_scan.l"
 { return T_OP_IN; }
        YY_BREAK
 /*
@@ -1043,7 +1040,7 @@ YY_RULE_SETUP
   */
 case 40:
 YY_RULE_SETUP
-#line 216 "ssl_expr_scan.l"
+#line 213 "ssl_expr_scan.l"
 { return T_FUNC_FILE; }
        YY_BREAK
 /*
@@ -1051,12 +1048,12 @@ YY_RULE_SETUP
   */
 case 41:
 YY_RULE_SETUP
-#line 221 "ssl_expr_scan.l"
+#line 218 "ssl_expr_scan.l"
 { return T_TRUE; }
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 222 "ssl_expr_scan.l"
+#line 219 "ssl_expr_scan.l"
 { return T_FALSE; }
        YY_BREAK
 /*
@@ -1064,9 +1061,9 @@ YY_RULE_SETUP
   */
 case 43:
 YY_RULE_SETUP
-#line 227 "ssl_expr_scan.l"
+#line 224 "ssl_expr_scan.l"
 {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, yytext);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, yytext);
     return T_DIGIT;
 }
        YY_BREAK
@@ -1075,9 +1072,9 @@ YY_RULE_SETUP
   */
 case 44:
 YY_RULE_SETUP
-#line 235 "ssl_expr_scan.l"
+#line 232 "ssl_expr_scan.l"
 {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, yytext);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, yytext);
     return T_ID;
 }
        YY_BREAK
@@ -1086,17 +1083,17 @@ YY_RULE_SETUP
   */
 case 45:
 YY_RULE_SETUP
-#line 243 "ssl_expr_scan.l"
+#line 240 "ssl_expr_scan.l"
 { 
     return yytext[0];
 }
        YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 247 "ssl_expr_scan.l"
+#line 244 "ssl_expr_scan.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
        YY_BREAK
-#line 1100 "lex.ssl_expr_yy.c"
+#line 1098 "lex.ssl_expr_yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(str):
 case YY_STATE_EOF(regex):
@@ -1985,7 +1982,7 @@ int main()
        return 0;
        }
 #endif
-#line 247 "ssl_expr_scan.l"
+#line 244 "ssl_expr_scan.l"
 
 
 int yyinput(char *buf, int max_size)
@@ -2000,4 +1997,4 @@ int yyinput(char *buf, int max_size)
     ssl_expr_info.inputptr += n;
     return n;
 }
-#endif /* XXX */
+

diff --git a/modules/ssl/ssl_expr_scan.l b/modules/ssl/ssl_expr_scan.l
index 55c3b5a27eedf59dc834bb5995da7ff03246fcf9..bbe53b10616e08695c4b52ed33827e221a8303ec 100644 (file)
--- a/modules/ssl/ssl_expr_scan.l
+++ b/modules/ssl/ssl_expr_scan.l
@@ -68,7 +68,6 @@
 
 %{
 #include "mod_ssl.h"
-#if 0 /* XXX */
 
 #include "ssl_expr_parse.h"
 
@@ -114,7 +113,7 @@ int yyinput(char *buf, int max_size);
 <str>\" {
     BEGIN(INITIAL);
     *cpStr = NUL;
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caStr);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caStr);
     return T_STRING;
 }
 <str>\n {
@@ -167,18 +166,18 @@ int yyinput(char *buf, int max_size);
     }
 }
 <regex_flags>i {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caRegex);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
     BEGIN(INITIAL);
     return T_REGEX_I;
 }
 <regex_flags>.|\n {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caRegex);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
     yyless(0);
     BEGIN(INITIAL);
     return T_REGEX;
 }
 <regex_flags><<EOF>> {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, caRegex);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
     BEGIN(INITIAL);
     return T_REGEX;
 }
@@ -223,7 +222,7 @@ int yyinput(char *buf, int max_size);
   * Digits
   */
 [0-9]+ {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, yytext);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, yytext);
     return T_DIGIT;
 }
 
@@ -231,7 +230,7 @@ int yyinput(char *buf, int max_size);
   * Identifiers
   */
 [a-zA-Z][a-zA-Z0-9_:-]* {
-    yylval.cpVal = ap_pstrdup(ssl_expr_info.pool, yytext);
+    yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, yytext);
     return T_ID;
 }
 
@@ -257,7 +256,3 @@ int yyinput(char *buf, int max_size)
     return n;
 }
 
-%{
-#endif /* XXX */
-%}
-