From 4b98f345d13040e7cf73d7cd1614aa358ad107f9 Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Sat, 10 Apr 1999 17:39:08 +0000
Subject: [PATCH] php3_ini?  What's that?

---
 Makefile.in | 1329 ++++++++++++++++++++++-----------------------------
 main/main.c |    3 +-
 mod_php3.c  |   88 +---
 mod_php3.h  |    4 +-
 4 files changed, 594 insertions(+), 830 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0b55518d5a2..19158d1c3dd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -210,47 +210,42 @@ depend:	parser-scanner
 	$(CC) $(CFLAGS) -MM $(SOURCE) | perl -pe 's|regex/regex.h||;' > Makefile.depend
 	$(CC) $(CFLAGS) -MM $(FUNCTIONS_SOURCE) | perl -pe 's|^(.+\.o)|functions/$$1|; s|regex/regex.h||;' >> Makefile.depend
 
-main.o: main.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h build-defs.h php_ini.h main.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h \
+main.o: main.c php.h php_version.h libzend/zend.h libzend/config.h \
+ libzend/config.unix.h libzend/zend_errors.h libzend/zend_alloc.h \
+ libzend/zend_hash.h libzend/zend_llist.h libzend/zend_API.h \
+ libzend/modules.h libzend/zend_list.h config.h request_info.h \
+ php3_compat.h libzend/zend_stack.h  safe_mode.h \
+ fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h build-defs.h \
+ php_ini.h php_globals.h main.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
  libzend/zend_execute.h control_structures.h \
- functions/basic_functions.h functions/info.h functions/head.h \
- functions/post.h functions/type.h snprintf.h logos.h
+ functions/basic_functions.h libzend/zend_highlight.h functions/info.h \
+ functions/head.h functions/post.h functions/type.h snprintf.h \
+ libzend/zend_indent.h logos.h
 internal_functions.o: internal_functions.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h internal_functions_registry.h \
- libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_execute.h functions/php3_ifx.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_execute.h functions/php3_ifx.h \
  functions/php3_ldap.h functions/php3_mysql.h functions/php3_bcmath.h \
- functions/php3_msql.h functions/basic_functions.h functions/phpmath.h \
- functions/php3_string.h functions/php3_oci8.h functions/oracle.h \
- functions/base64.h functions/php3_dir.h functions/dns.h \
- functions/php3_pgsql.h functions/php3_velocis.h \
- functions/php3_sybase.h functions/php3_sybase-ct.h functions/reg.h \
- functions/php3_mail.h functions/imap.h functions/md5.h \
- functions/global.h functions/php3_gd.h functions/html.h \
- functions/dl.h functions/head.h functions/post.h functions/exec.h \
- functions/php3_solid.h functions/adabasd.h functions/file.h \
- functions/dbase.h functions/hw.h functions/filepro.h functions/db.h \
- functions/php3_syslog.h functions/php3_filestat.h \
- functions/php3_browscap.h functions/pack.h \
+ functions/php3_msql.h functions/basic_functions.h \
+ libzend/zend_highlight.h functions/phpmath.h functions/php3_string.h \
+ functions/php3_oci8.h functions/oracle.h functions/base64.h \
+ functions/php3_dir.h functions/dns.h functions/php3_pgsql.h \
+ functions/php3_velocis.h functions/php3_sybase.h \
+ functions/php3_sybase-ct.h functions/reg.h functions/php3_mail.h \
+ functions/imap.h functions/md5.h functions/global.h \
+ functions/php3_gd.h functions/html.h functions/dl.h functions/head.h \
+ functions/post.h functions/exec.h functions/php3_solid.h \
+ functions/adabasd.h functions/file.h functions/dbase.h functions/hw.h \
+ functions/filepro.h functions/db.h functions/php3_syslog.h \
+ functions/php3_filestat.h functions/php3_browscap.h functions/pack.h \
  functions/php3_unified_odbc.h dl/snmp/php3_snmp.h \
  functions/php3_zlib.h functions/php3_COM.h functions/php3_interbase.h \
  functions/php3_xml.h functions/php3_pdf.h functions/php3_fdf.h \
@@ -259,136 +254,106 @@ internal_functions.o: internal_functions.c php.h php_version.h \
 snprintf.o: snprintf.c config.h
 php3_sprintf.o: php3_sprintf.c config.h
 configuration-parser.o: configuration-parser.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/dl.h functions/file.h \
- functions/php3_browscap.h libzend/zend_extensions.h \
- libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_execute.h
-configuration-scanner.o: configuration-scanner.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h configuration-parser.h
-request_info.o: request_info.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h
-safe_mode.o: safe_mode.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
  libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/pageinfo.h
-fopen-wrappers.o: fopen-wrappers.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h php3_realpath.h functions/head.h \
- functions/url.h functions/base64.h functions/fsock.h \
- functions/php3_string.h libzend/zend_compile.h \
- libzend/zend-parser.h libzend/zend_globals.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h php_globals.h php_ini.h functions/dl.h \
+ functions/file.h functions/php3_browscap.h libzend/zend_extensions.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
  libzend/zend_ptr_stack.h libzend/zend_execute.h
-php3_realpath.o: php3_realpath.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h
+configuration-scanner.o: configuration-scanner.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h configuration-parser.h
+request_info.o: request_info.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
+safe_mode.o: safe_mode.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/pageinfo.h
+fopen-wrappers.o: fopen-wrappers.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
+ php3_realpath.h functions/head.h functions/url.h functions/base64.h \
+ functions/fsock.h functions/php3_string.h libzend/zend_compile.h \
+ libzend/zend-parser.h libzend/zend_globals.h libzend/zend_ptr_stack.h \
+ libzend/zend_execute.h
+php3_realpath.o: php3_realpath.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
 alloca.o: alloca.c
-output.o: output.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h
+output.o: output.c php.h php_version.h libzend/zend.h libzend/config.h \
+ libzend/config.unix.h libzend/zend_errors.h libzend/zend_alloc.h \
+ libzend/zend_hash.h libzend/zend_llist.h libzend/zend_API.h \
+ libzend/modules.h libzend/zend_list.h config.h request_info.h \
+ php3_compat.h libzend/zend_stack.h  safe_mode.h \
+ fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h
 php_ini.o: php_ini.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h php_ini.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
+ php_globals.h
 functions/adabasd.o: functions/adabasd.c config.h build-defs.h php.h \
- php_version.h libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ php_version.h libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_string.h \
- functions/head.h functions/adabasd.h
-functions/apache.o: functions/apache.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h
-functions/fhttpd.o: functions/fhttpd.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h
+ libzend/zend_constants.h functions/php3_string.h functions/head.h \
+ functions/adabasd.h
+functions/apache.o: functions/apache.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ php_globals.h php_ini.h mod_php3.h
+functions/fhttpd.o: functions/fhttpd.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
 functions/basic_functions.o: functions/basic_functions.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h php_ini.h \
- internal_functions_registry.h functions/basic_functions.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h php_ini.h internal_functions_registry.h \
+ functions/basic_functions.h libzend/zend_highlight.h \
  functions/phpmath.h functions/php3_string.h functions/dns.h \
  functions/md5.h functions/global.h functions/html.h functions/post.h \
  functions/exec.h functions/info.h functions/url.h \
@@ -396,682 +361,528 @@ functions/basic_functions.o: functions/basic_functions.c php.h php_version.h \
  functions/php3_link.h functions/php3_filestat.h functions/microtime.h \
  functions/pageinfo.h functions/uniqid.h functions/base64.h \
  functions/php3_mail.h functions/php3_var.h functions/php3_iptc.h \
- functions/quot_print.h functions/cyr_convert.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_execute.h
+ functions/quot_print.h functions/cyr_convert.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_execute.h php_globals.h
 functions/crypt.o: functions/crypt.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_string.h
-functions/datetime.o: functions/datetime.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/datetime.h snprintf.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_string.h
+functions/datetime.o: functions/datetime.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/datetime.h snprintf.h php_globals.h
 functions/db.o: functions/db.c
 functions/dbase.o: functions/dbase.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h
 functions/dir.o: functions/dir.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_dir.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_dir.h
 functions/dl.o: functions/dl.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/dl.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/dl.h \
+ php_globals.h
 functions/dns.o: functions/dns.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/dns.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/dns.h
 functions/exec.o: functions/exec.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_string.h \
- functions/head.h functions/exec.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_string.h functions/head.h functions/exec.h \
+ php_globals.h
 functions/file.o: functions/file.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h \
- functions/php3_string.h functions/file.h snprintf.h functions/fsock.h
-functions/filepro.o: functions/filepro.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/filepro.h
-functions/filestat.o: functions/filestat.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_filestat.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_string.h functions/file.h snprintf.h functions/fsock.h \
+ php_globals.h
+functions/filepro.o: functions/filepro.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
+ functions/filepro.h
+functions/filestat.o: functions/filestat.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
+ functions/php3_filestat.h
 functions/formatted_print.o: functions/formatted_print.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h \
- functions/php3_string.h
-functions/fsock.o: functions/fsock.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
  libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/fsock.h \
- functions/base64.h functions/file.h functions/post.h functions/url.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/head.h functions/php3_string.h \
+ libzend/zend_execute.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_globals.h libzend/zend_ptr_stack.h
+functions/fsock.o: functions/fsock.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/base64.h \
+ functions/file.h functions/post.h functions/url.h functions/fsock.h \
  build-defs.h
 functions/gd.o: functions/gd.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h \
- functions/php3_gd.h functions/gdttf.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_gd.h
 functions/head.o: functions/head.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/reg.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
  functions/php3_string.h functions/pageinfo.h main.h \
  libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_execute.h functions/datetime.h functions/head.h \
- functions/post.h functions/url.h
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h \
+ functions/datetime.h functions/head.h functions/post.h php_globals.h \
+ functions/url.h
 functions/html.o: functions/html.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/reg.h functions/html.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
+ functions/html.h
 functions/image.o: functions/image.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/image.h
-functions/imap.o: functions/imap.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/image.h
+functions/imap.o: functions/imap.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
 functions/link.o: functions/link.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_filestat.h \
- functions/php3_link.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_filestat.h php_globals.h functions/php3_link.h
 functions/mail.o: functions/mail.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h build-defs.h functions/php3_mail.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h build-defs.h \
+ functions/php3_mail.h php_ini.h
 functions/math.o: functions/math.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/phpmath.h snprintf.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/phpmath.h \
+ snprintf.h
 functions/iptc.o: functions/iptc.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_iptc.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_iptc.h
 functions/md5.o: functions/md5.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/md5.h functions/global.h
-functions/microtime.o: functions/microtime.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/microtime.h snprintf.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/md5.h \
+ functions/global.h
+functions/microtime.o: functions/microtime.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/microtime.h snprintf.h
 functions/mime.o: functions/mime.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/type.h functions/post.h \
- functions/mime.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h \
- libzend/zend-parser.h libzend/zend_execute.h
-functions/msql.o: functions/msql.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_msql.h \
- functions/reg.h functions/php3_string.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/type.h \
+ functions/post.h functions/mime.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_execute.h php_globals.h
+functions/msql.o: functions/msql.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_msql.h functions/reg.h functions/php3_string.h \
+ php_globals.h
 functions/mysql.o: functions/mysql.c config.h build-defs.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_string.h \
- functions/php3_mysql.h
-functions/oracle.o: functions/oracle.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/oracle.h
+ libzend/zend_constants.h php_globals.h functions/php3_string.h \
+ functions/php3_mysql.h php_ini.h
+functions/oracle.o: functions/oracle.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/oracle.h
 functions/oci8.o: functions/oci8.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_oci8.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_oci8.h
 functions/pack.o: functions/pack.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
  functions/php3_string.h functions/pack.h snprintf.h functions/fsock.h
-functions/pageinfo.o: functions/pageinfo.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/pageinfo.h
-functions/pgsql.o: functions/pgsql.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_pgsql.h \
- functions/php3_string.h
+functions/pageinfo.o: functions/pageinfo.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/pageinfo.h
+functions/pgsql.o: functions/pgsql.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_pgsql.h functions/php3_string.h php_globals.h
 functions/post.o: functions/post.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/mime.h functions/type.h \
- functions/php3_string.h functions/post.h functions/url.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/mime.h \
+ functions/type.h functions/php3_string.h functions/post.h \
+ functions/url.h php_globals.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
  libzend/zend_execute.h
 functions/rand.o: functions/rand.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/phpmath.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/phpmath.h
 functions/reg.o: functions/reg.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_string.h \
- functions/reg.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_string.h functions/reg.h
 functions/solid.o: functions/solid.c config.h build-defs.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h functions/php3_solid.h
-functions/soundex.o: functions/soundex.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_string.h
-functions/string.o: functions/string.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/reg.h functions/post.h \
+functions/soundex.o: functions/soundex.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
  functions/php3_string.h
-functions/syslog.o: functions/syslog.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h \
- libzend/zend-parser.h libzend/zend_execute.h \
+functions/string.o: functions/string.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
+ functions/post.h functions/php3_string.h libzend/zend_execute.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h php_globals.h
+functions/syslog.o: functions/syslog.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
+ libzend/zend_globals.h libzend/zend_ptr_stack.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h \
  functions/php3_syslog.h
 functions/type.o: functions/type.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/type.h
-functions/uniqid.o: functions/uniqid.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/uniqid.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/type.h
+functions/uniqid.o: functions/uniqid.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/uniqid.h
 functions/sybase.o: functions/sybase.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h functions/php3_sybase.h \
- functions/php3_string.h
+ functions/php3_string.h php_globals.h
 functions/sybase-ct.o: functions/sybase-ct.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h functions/php3_sybase-ct.h \
- functions/php3_string.h
+ functions/php3_string.h php_globals.h
 functions/url.o: functions/url.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/url.h
-functions/base64.o: functions/base64.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/base64.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/url.h
+functions/base64.o: functions/base64.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/base64.h
 functions/info.o: functions/info.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h functions/info.h \
- build-defs.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h \
- libzend/zend-parser.h libzend/zend_execute.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
+ php_globals.h functions/head.h functions/info.h build-defs.h \
+ libzend/zend_globals.h libzend/zend_ptr_stack.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h
 functions/bcmath.o: functions/bcmath.c config.h build-defs.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/number.h \
- functions/php3_bcmath.h
+ libzend/zend_constants.h functions/number.h functions/php3_bcmath.h
 functions/number.o: functions/number.c functions/number.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h
 functions/xml.o: functions/xml.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_xml.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_xml.h
 functions/unified_odbc.o: functions/unified_odbc.c config.h build-defs.h php.h \
- php_version.h libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ php_version.h libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h dl/phpdl.h functions/php3_string.h \
  functions/php3_unified_odbc.h functions/head.h snprintf.h
-functions/ldap.o: functions/ldap.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h
-functions/browscap.o: functions/browscap.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_browscap.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h \
+functions/ldap.o: functions/ldap.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
+functions/browscap.o: functions/browscap.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_browscap.h php_ini.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
  libzend/zend_execute.h
-functions/velocis.o: functions/velocis.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_velocis.h
-functions/gdttf.o: functions/gdttf.c config.h functions/gdttf.h \
- functions/gdcache.h
-functions/gdcache.o: functions/gdcache.c config.h functions/gdcache.h
+functions/velocis.o: functions/velocis.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_velocis.h
+functions/gdttf.o: functions/gdttf.c config.h
+functions/gdcache.o: functions/gdcache.c config.h
 functions/zlib.o: functions/zlib.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
  functions/php3_string.h functions/php3_zlib.h snprintf.h
 functions/COM.o: functions/COM.c
-functions/ifx.o: functions/ifx.c
 functions/pdf.o: functions/pdf.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
  functions/php3_pdf.h
-functions/hw.o: functions/hw.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h
+functions/hw.o: functions/hw.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h
 functions/hg_comm.o: functions/hg_comm.c config.h
 functions/dlist.o: functions/dlist.c config.h
 functions/fdf.o: functions/fdf.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
  functions/php3_fdf.h
 functions/snmp.o: functions/snmp.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_snmp.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_snmp.h
 functions/var.o: functions/var.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/reg.h functions/post.h \
- functions/php3_string.h functions/php3_var.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
+ functions/post.h functions/php3_string.h functions/php3_var.h
 functions/interbase.o: functions/interbase.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
  libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h functions/php3_interbase.h
 functions/quot_print.o: functions/quot_print.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h functions/quot_print.h
 functions/cyr_convert.o: functions/cyr_convert.c php.h php_version.h \
- libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
-  safe_mode.h fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
  libzend/zend_constants.h functions/cyr_convert.h
 functions/sysvsem.o: functions/sysvsem.c config.h
 functions/sysvshm.o: functions/sysvshm.c config.h
 functions/dav.o: functions/dav.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h  safe_mode.h \
- fopen-wrappers.h mod_php3.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_dav.h
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_dav.h
 
 # Local Variables:
 # tab-width: 4
diff --git a/main/main.c b/main/main.c
index 80ba4329e63..2a925095871 100644
--- a/main/main.c
+++ b/main/main.c
@@ -247,6 +247,7 @@ PHP_INI_BEGIN()
 	PHP_INI_ENTRY("max_execution_time",		"30",			PHP_INI_ALL,		OnChangeMaxExecutionTime,		NULL)
 	PHP_INI_ENTRY("memory_limit",			"8388608",		PHP_INI_ALL,		OnChangeMemoryLimit,			NULL)
 
+	PHP_INI_ENTRY("track_vars",				"0",			PHP_INI_ALL,		OnUpdateInt,			(void *) XtOffsetOf(php_core_globals, track_vars))
 	PHP_INI_ENTRY("gpc_order",				"GPC",			PHP_INI_ALL,		OnUpdateStringUnempty,	(void *) XtOffsetOf(php_core_globals, gpc_order))
 	PHP_INI_ENTRY("arg_separator",			"&",			PHP_INI_ALL,		OnUpdateStringUnempty,	(void *) XtOffsetOf(php_core_globals, arg_separator))
 PHP_INI_END()
@@ -604,12 +605,12 @@ static void php_message_handler_for_zend(long message, void *data)
 			php3_error(E_WARNING, "Failed opening '%s' for highlighting", php3_strip_url_passwd((char *) data));
 			break;
 		case ZMSG_MEMORY_LEAK_DETECTED: {
-				mem_header *t = (mem_header *) data;
 				ELS_FETCH();
 
 				if (EG(error_reporting)&E_WARNING) {
 #if ZEND_DEBUG
 #	if APACHE  /* log into the errorlog, since at this time we can't send messages to the browser */
+					mem_header *t = (mem_header *) data;
 					char memory_leak_buf[512];
 
 					snprintf(memory_leak_buf,512,"Possible PHP3 memory leak detected (harmless):  %d bytes from %s:%d",t->size,t->filename,t->lineno);
diff --git a/mod_php3.c b/mod_php3.c
index 89bf4fe9f99..4fb46433d58 100644
--- a/mod_php3.c
+++ b/mod_php3.c
@@ -25,6 +25,7 @@
    +----------------------------------------------------------------------+
    | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    | (with helpful hints from Dean Gaudet <dgaudet@arctic.org>            |
+   | PHP4 patches by Zeev Suraski <zeev@zend.com>                         |
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
@@ -103,8 +104,7 @@ int saved_umask;
 # define php3i_popenf(p,n,f,m) popenf((p),(n),(f),(m))
 #endif
 
-extern php3_ini_structure php3_ini;  /* active config */
-extern php3_ini_structure php3_ini_master;  /* master copy of config */
+php_apache_info_struct php_apache_info;		/* active config */
 
 int apache_php3_module_main(request_rec * r, int fd, int display_source_mode);
 extern int php3_module_startup();
@@ -186,7 +186,6 @@ void php3_restore_umask()
 int send_php3(request_rec *r, int display_source_mode, char *filename)
 {
 	int fd, retval;
-	php3_ini_structure *conf;
 
 	/* We don't accept OPTIONS requests, but take everything else */
 	if (r->method_number == M_OPTIONS) {
@@ -199,16 +198,10 @@ int send_php3(request_rec *r, int display_source_mode, char *filename)
 		return NOT_FOUND;
 	}
 
-	/* grab configuration settings */
-	conf = (php3_ini_structure *) get_module_config(r->per_dir_config,
-													&php3_module);
-	/* copy to active configuration */
-	memcpy(&php3_ini,conf,sizeof(php3_ini_structure));
-
 	/* If PHP parser engine has been turned off with a "php3_engine off"
 	 * directive, then decline to handle this request
 	 */
-	if (!conf->engine) {
+	if (!php_apache_info.engine) {
 		r->content_type = "text/html";
 		r->allowed |= (1 << METHODS) - 1;
 		return DECLINED;
@@ -228,7 +221,7 @@ int send_php3(request_rec *r, int display_source_mode, char *filename)
 		return retval;
 #endif
 
-	if (conf->last_modified) {
+	if (php_apache_info.last_modified) {
 #if MODULE_MAGIC_NUMBER < 19970912
 		if ((retval = set_last_modified(r, r->finfo.st_mtime))) {
 			return retval;
@@ -270,39 +263,15 @@ int send_parsed_php3_source(request_rec * r)
 }
 
 /*
- * Create the per-directory config structure with defaults from php3_ini_master
+ * Create the per-directory config structure with defaults
  */
 static void *php3_create_dir(pool * p, char *dummy)
 {
-	php3_ini_structure *new;
+	php_apache_info_struct *new;
 
-	php3_module_startup();  /* php3_ini_master is set up here */
+	new = (php_apache_info_struct *) palloc(p, sizeof(php_apache_info_struct));
+	memcpy(new, &php_apache_info, sizeof(php_apache_info_struct));
 
-	new = (php3_ini_structure *) palloc(p, sizeof(php3_ini_structure));
-	memcpy(new,&php3_ini_master,sizeof(php3_ini_structure));
-
-
-	return new;
-}
-
-/*
- * Merge in per-directory .conf directives
- */
-static void *php3_merge_dir(pool *p, void *basev, void *addv) 
-{
-	php3_ini_structure *new = (php3_ini_structure *) palloc(p, sizeof(php3_ini_structure));
-	php3_ini_structure *base = (php3_ini_structure *) basev;
-	php3_ini_structure *add = (php3_ini_structure *) addv;
-	php3_ini_structure orig = php3_ini_master;
-
-	/* Start with the base config */
-	memcpy(new,base,sizeof(php3_ini_structure));
-
-	/* skip the highlight stuff */
-	if (add->engine != orig.engine) new->engine = add->engine;
-	if (add->last_modified != orig.last_modified) new->last_modified = add->last_modified;
-	if (add->dav_script != orig.dav_script) new->dav_script = add->dav_script;
-	
 	return new;
 }
 
@@ -313,14 +282,14 @@ static void *php3_merge_dir(pool *p, void *basev, void *addv)
 #define CONST_PREFIX
 #endif
 
-CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php3_ini_structure *conf, char *arg1, char *arg2)
+CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2)
 {
 	php_alter_ini_entry(arg1, strlen(arg1)+1, arg2, strlen(arg2)+1, PHP_INI_PERDIR);
 	return NULL;
 }
 
 
-CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php3_ini_structure *conf, char *arg1, char *arg2)
+CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2)
 {
 	char bool_val[2];
 
@@ -336,31 +305,11 @@ CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php3_ini_structure *c
 }
 
 
-#if MODULE_MAGIC_NUMBER > 19961007
-const char *php3take1handler(cmd_parms * cmd, php3_ini_structure * conf, char *arg)
-{
-#else
-char *php3take1handler(cmd_parms * cmd, php3_ini_structure * conf, char *arg)
-{
-#endif
-	int c = (int) cmd->info;
-
-	switch (c) {
-		case 0:
-			conf->errors = atoi(arg);
-			break;
-		case 20:
-			conf->dav_script = pstrdup(cmd->pool, arg);
-			break;
-	}
-	return NULL;
-}
-
 int php3_xbithack_handler(request_rec * r)
 {
-	php3_ini_structure *conf;
+	php_apache_info_struct *conf;
 
-	conf = (php3_ini_structure *) get_module_config(r->per_dir_config, &php3_module);
+	conf = (php_apache_info_struct *) get_module_config(r->per_dir_config, &php3_module);
 	if (!(r->finfo.st_mode & S_IXUSR)) {
 		r->allowed |= (1 << METHODS) - 1;
 		return DECLINED;
@@ -375,6 +324,7 @@ int php3_xbithack_handler(request_rec * r)
 void php3_init_handler(server_rec *s, pool *p)
 {
 	register_cleanup(p, NULL, php3_module_shutdown, php3_module_shutdown_for_exec);
+	php3_module_startup();
 #if MODULE_MAGIC_NUMBER >= 19980527
 	ap_add_version_component("PHP/" PHP_VERSION);
 #endif
@@ -389,18 +339,18 @@ extern int phpdav_mkcol_create_handler(request_rec *r);
 /* conf is being read twice (both here and in send_php3()) */
 int send_parsed_php3_dav_script(request_rec *r)
 {
-	php3_ini_structure *conf;
+	php_apache_info_struct *conf;
 
-	conf = (php3_ini_structure *) get_module_config(r->per_dir_config,
+	conf = (php_apache_info_struct *) get_module_config(r->per_dir_config,
 													&php3_module);
 	return send_php3(r, 0, 0, conf->dav_script);
 }
 
 static int php3_type_checker(request_rec *r)
 {
-	php3_ini_structure *conf;
+	php_apache_info_struct *conf;
 
-	conf = (php3_ini_structure *)get_module_config(r->per_dir_config,
+	conf = (php_apache_info_struct *)get_module_config(r->per_dir_config,
 												   &php3_module);
 
     /* If DAV support is enabled, use mod_dav's type checker. */
@@ -433,7 +383,7 @@ handler_rec php3_handlers[] =
 
 command_rec php3_commands[] =
 {
-	{"php4_directive",		php_apache_value_handler, NULL, OR_OPTIONS, TAKE2, "PHP Value Modifier"},
+	{"php4_value",		php_apache_value_handler, NULL, OR_OPTIONS, TAKE2, "PHP Value Modifier"},
 	{"php4_flag",			php_apache_flag_handler, NULL, OR_OPTIONS, TAKE2, "PHP Flag Modifier"},
 	{NULL}
 };
@@ -445,7 +395,7 @@ module MODULE_VAR_EXPORT php3_module =
 	STANDARD_MODULE_STUFF,
 	php3_init_handler,			/* initializer */
 	php3_create_dir,			/* per-directory config creator */
-	php3_merge_dir,				/* dir merger */
+	NULL,						/* dir merger */
 	NULL,						/* per-server config creator */
 	NULL, 						/* merge server config */
 	php3_commands,				/* command table */
diff --git a/mod_php3.h b/mod_php3.h
index 325122049b7..35eeb50e7de 100644
--- a/mod_php3.h
+++ b/mod_php3.h
@@ -42,7 +42,9 @@ typedef struct {
     long last_modified;
 	char *dav_script;
 	long xbithack;
-} php3_ini_structure;
+} php_apache_info_struct;
+
+extern php_apache_info_struct php_apache_info;
 
 #if MSVC5
 #define S_IXUSR _S_IEXEC