rse 98/04/09 01:20:36
Modified: . STATUS
src ApacheCore.dsp ApacheCore.mak CHANGES
Configuration.tmpl Configure Makefile.tmpl
src/ap Makefile.tmpl
src/include alloc.h conf.h
src/main Makefile.tmpl gen_test_char.mak
src/modules/experimental Makefile.tmpl
src/modules/proxy ApacheModuleProxy.mak Makefile.tmpl
src/modules/standard Makefile.tmpl mod_so.c
src/modules/test Makefile.tmpl
src/os/unix Makefile.tmpl os.h
src/os/win32 ApacheModuleAuthAnon.mak
ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
ApacheModuleExpires.mak ApacheModuleHeaders.mak
ApacheModuleInfo.mak ApacheModuleRewrite.mak
ApacheModuleSpeling.mak ApacheModuleStatus.mak
ApacheModuleUserTrack.mak
src/test/rename README
Removed: src/helpers UpdateHide
src/include hide.h
Log:
Time has come to remove the HIDE stuff as the first step or we never get 1.3b6
out of the door. (Hmmm.... a unthankfully job I have to do here, a very
unthankfully one... removing stuff for which we've investigated a lot of time,
especially myself....)
Revision Changes Path
1.283 +0 -12 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- STATUS 1998/04/09 01:28:57 1.282
+++ STATUS 1998/04/09 08:20:17 1.283
@@ -76,8 +76,6 @@
* Ralf's mod_rewrite meta-construct expansion inconsistency fix
* Martin's new URI parsing stuff (the source module main/util_uri.c)
* New `%a' construct for LogFormat and CustomLog. PR#1885
- * Ralf's `Rule HIDE' feature for hiding the symbol namespace
- -- under debate
* Make \\ behave as expected.
* Fix for "poly" directive in image maps. PR#1771
* Reduce memory usage, and speed up ServerAlias support. PR#1531
@@ -86,8 +84,6 @@
* Dean's new mod_test_util_uri.c
* back out USE_PTHREAD_SERIALIZED_ACCEPT for solaris
* Ken's abstraction of SERVER_{BUILT,VERSION}
- * Ken's fix for os/unix/os.h and the new -DHIDE functionality
- -- needs to be undone when HIDE is backed out
* Ralf's Config File Line Continuation
* Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite PR#1696
* Ralf's fix for the `<VirtualHost> w/o mod_rewrite' situation. PR#1790
@@ -117,8 +113,6 @@
* Marc's mod_proxy was not clearing the Proxy-Connection header
* Dean's API_EXPORT and CORE_EXPORT cleanup for core functions
* Ralf's new ApacheBench support program (src/support/ab.c)
- * Ken's change HIDE default to "yes", always include hide.h
- -- under debate
* Ralf's major Configure cleanup
* Ralf's additional manual pages for the support programs
* Ben Hyde's Configure check for unknown command switch
@@ -127,8 +121,6 @@
* Ralf's mod_proxy fix to use FTP SIZE response for Content-Length,
PR#1183
* Ralf's change to make the shared object compilation command more
portable
* Dean's protect against FD_SETSIZE mismatches
- * Ralf's fallback stategy because of HIDE for loading shared object
modules
- -- does this need to be revisited due to HIDE rollback?
* Martin's fix to allow %2F chars in proxy requests and in the uri query
part
* fix to mark listening sockets for closure in the parent after a SIGHUP
@@ -219,10 +211,6 @@
NOTES:
- Marc: this is the wrong time for such a big change
- - Ralf: Yes, I personally also would like to keep HIDE, but
- now because it's vetoed, it's better to rename the
- source instead of just having the
- namespace-conflicts again.
* What prefixes to use for the renaming:
1.26 +0 -4 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ApacheCore.dsp 1998/03/30 13:27:39 1.25
+++ ApacheCore.dsp 1998/04/09 08:20:18 1.26
@@ -402,10 +402,6 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\include\hide.h
-# End Source File
-# Begin Source File
-
SOURCE=.\main\test_char.h
# End Source File
# Begin Source File
1.36 +0 -82 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ApacheCore.mak 1998/03/30 13:27:40 1.35
+++ ApacheCore.mak 1998/04/09 08:20:18 1.36
@@ -449,7 +449,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
@@ -470,7 +469,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
@@ -496,7 +494,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -517,7 +514,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -543,7 +539,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
@@ -568,7 +563,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
@@ -589,7 +583,6 @@
DEP_CPP_FNMAT=\
".\include\conf.h"\
".\include\fnmatch.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\os\win32\os.h"\
@@ -603,7 +596,6 @@
DEP_CPP_FNMAT=\
".\include\conf.h"\
".\include\fnmatch.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\os\win32\os.h"\
@@ -643,7 +635,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -676,7 +667,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -707,7 +697,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -746,7 +735,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -782,7 +770,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -812,7 +799,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -841,7 +827,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -882,7 +867,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -920,7 +904,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -955,7 +938,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -989,7 +971,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1023,7 +1004,6 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1054,7 +1034,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1085,7 +1064,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1111,7 +1089,6 @@
DEP_CPP_MD5C_=\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\md5.h"\
".\os\win32\os.h"\
@@ -1130,7 +1107,6 @@
DEP_CPP_MD5C_=\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\md5.h"\
".\os\win32\os.h"\
@@ -1152,7 +1128,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1182,7 +1157,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1210,7 +1184,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1243,7 +1216,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1274,7 +1246,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1301,7 +1272,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1326,7 +1296,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -1358,7 +1327,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -1388,7 +1356,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1418,7 +1385,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1446,7 +1412,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1479,7 +1444,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1510,7 +1474,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1544,7 +1507,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1576,7 +1538,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1609,7 +1570,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1640,7 +1600,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1667,7 +1626,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1692,7 +1650,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1725,7 +1682,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1756,7 +1712,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1791,7 +1746,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1822,7 +1776,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1853,7 +1806,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1883,7 +1835,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1912,7 +1863,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1939,7 +1889,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1966,7 +1915,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1991,7 +1939,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2022,7 +1969,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2051,7 +1997,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2080,7 +2025,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2107,7 +2051,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -2135,7 +2078,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -2161,7 +2103,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2188,7 +2129,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2213,7 +2153,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2239,7 +2178,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2261,7 +2199,6 @@
DEP_CPP_MULTI=\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\multithread.h"\
".\os\win32\os.h"\
@@ -2277,7 +2214,6 @@
DEP_CPP_MULTI=\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\multithread.h"\
".\os\win32\os.h"\
@@ -2325,7 +2261,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
@@ -2351,7 +2286,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
@@ -2376,7 +2310,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -2405,7 +2338,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -2432,7 +2364,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2463,7 +2394,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2493,7 +2423,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2522,7 +2451,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2546,7 +2474,6 @@
DEP_CPP_UTIL_D=\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
@@ -2565,7 +2492,6 @@
DEP_CPP_UTIL_D=\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
@@ -2587,7 +2513,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\md5.h"\
@@ -2615,7 +2540,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\md5.h"\
@@ -2641,7 +2565,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -2676,7 +2599,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -2709,7 +2631,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2738,7 +2659,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2765,7 +2685,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
@@ -2790,7 +2709,6 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
- ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
1.761 +0 -15 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -r1.760 -r1.761
--- CHANGES 1998/04/08 16:08:11 1.760
+++ CHANGES 1998/04/09 08:20:19 1.761
@@ -146,11 +146,6 @@
%2f in them (occurs quite often in
http://.../cgi-bin/...?http%3A%2F%2F... references) [Martin Kraemer]
- *) Finally fix the shared object loading by using a fallback strategy to
- overcome the HIDE feature problematic without loosing special cases.
Also
- a huge comment was added to mod_so.c to make the situation more clear
- for the future. [Ralf S. Engelschall]
-
*) Protect against FD_SETSIZE mismatches. [Dean Gaudet]
*) Make the shared object compilation command more portable by avoiding
@@ -193,12 +188,6 @@
verbose than GNU make), same style to comments in the Configure script,
added Apache license header, fixed a few bugs, etc. [Ralf S.
Engelschall]
- *) The default for the HIDE rule is now "yes" to aid portability, and
- include/hide.h is always included. It doesn't do anything if the
- rule is "no" but the dependencies don't change now regardless.
- Previously, a "make depend" would result in different dependencies
- according to how the rule was set. [Ken Coar]
-
*) Add the new ApacheBench program "ab" to src/support/: This is derived
from the ZeusBench benchmarking program and can be used to determine the
response performance of an Apache installation. This version is
@@ -420,10 +409,6 @@
[Konstantin Morshnev <[EMAIL PROTECTED]>] PR#1771
*) Make \\ behave as expected. [EMAIL PROTECTED]
-
- *) Add `Rule HIDE' to Configuration to hide the Apache symbol
- namespace from conflicting with third-party libraries some
- modules force to be linked with Apache. [Ralf S. Engelschall]
*) Add the `%a' construct to LogFormat and CustomLog to log the client IP
address. [Todd Eigenschink <[EMAIL PROTECTED]>, PR#1885]
1.96 +1 -7 apache-1.3/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- Configuration.tmpl 1998/04/07 07:16:47 1.95
+++ Configuration.tmpl 1998/04/09 08:20:19 1.96
@@ -89,7 +89,7 @@
# functions. The format is: Rule RULE=value
#
# At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
-# STATUS, IRIXNIS, IRIXN32, PARANOID, and HIDE.
+# STATUS, IRIXNIS, IRIXN32 and PARANOID.
#
# For all Rules, if set to "yes", then Configure knows we want that
# capability and does what is required to add it in. If set to "default"
@@ -124,18 +124,12 @@
# is performing this function. If PARANOID is set to yes, it will
# actually print-out the code that the modules execute
#
-# HIDE:
-# This has no run-time penalty, but helps keep the Apache
-# namespace from colliding with that used by other libraries
-# pulled in by modules.
-#
Rule STATUS=yes
Rule SOCKS4=no
Rule IRIXNIS=no
Rule IRIXN32=yes
Rule PARANOID=no
-Rule HIDE=yes
# The following rules should be set automatically by Configure. However, if
# they are not set by Configure (because we don't know the correct value for
1.230 +0 -8 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- Configure 1998/04/08 16:08:11 1.229
+++ Configure 1998/04/09 08:20:19 1.230
@@ -232,7 +232,6 @@
RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file`
RULE_IRIXN32=`./helpers/CutRule IRIXN32 $file`
RULE_PARANOID=`./helpers/CutRule PARANOID $file`
-RULE_HIDE=`./helpers/CutRule HIDE $file`
####################################################################
## Preset some "constants";
@@ -1145,13 +1144,6 @@
REGLIB="regex/libregex.a"
SUBDIRS="$SUBDIRS regex"
CFLAGS="$CFLAGS -DUSE_HSREGEX"
-fi
-
-####################################################################
-## Now the definition of HIDE if needed/wanted.
-##
-if [ "$RULE_HIDE" = "yes" ]; then
- CFLAGS="$CFLAGS -DHIDE"
fi
####################################################################
1.89 +2 -19 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Makefile.tmpl 1998/04/08 16:08:12 1.88
+++ Makefile.tmpl 1998/04/09 08:20:20 1.89
@@ -63,31 +63,14 @@
( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)' depend ) || exit 1; \
done
-# We really don't expect end users to use this rule. It builds a
-# httpd binary with all modules built in and then updates the
-# $(INCDIR)/hide.h file according to the exported symbols of this
-# binary. So run this target once after a new function was added
-# to the source. But never trust this operation. You really
-# have to review the changes manually afterwards.
-updatehide:
- cat Configuration.tmpl |\
- sed -e 's/^#*[ ]*\(AddModule\)/\1/g' |\
- sed -e 's/^\(AddModule.*auth_db.*\)/# \1/g' \
- >Configuration.for-hide
- ./Configure -file Configuration.for-hide
- $(MAKE) clean httpd
- ./helpers/UpdateHide httpd $(INCDIR)/hide.h `helpers/GuessOS`
- $(MAKE) clean
- rm -f Configuration.for-hide
-
#Dependencies
$(OBJS): Makefile
# DO NOT REMOVE
-buildmark.o: buildmark.c include/conf.h os/unix/os.h include/hide.h \
+buildmark.o: buildmark.c include/conf.h os/unix/os.h \
include/hsregex.h include/httpd.h include/alloc.h include/buff.h \
include/ap.h include/util_uri.h
modules.o: modules.c include/httpd.h include/conf.h os/unix/os.h \
- include/hide.h include/hsregex.h include/alloc.h include/buff.h \
+ include/hsregex.h include/alloc.h include/buff.h \
include/ap.h include/util_uri.h include/http_config.h
1.19 +6 -6 apache-1.3/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.tmpl 1998/03/28 12:06:54 1.18
+++ Makefile.tmpl 1998/04/09 08:20:23 1.19
@@ -36,26 +36,26 @@
# DO NOT REMOVE
ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h
ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h
ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h
ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_log.h
ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h
ap_strings.o: ap_strings.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h
1.54 +0 -1 apache-1.3/src/include/alloc.h
Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- alloc.h 1998/04/06 06:43:14 1.53
+++ alloc.h 1998/04/09 08:20:24 1.54
@@ -94,7 +94,6 @@
* destroyed before the parent pool
*/
#ifndef POOL_DEBUG
-/* could be defined when we're using HIDE */
#ifdef pool_join
#undef pool_join
#endif
1.200 +0 -8 apache-1.3/src/include/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- conf.h 1998/03/31 12:52:19 1.199
+++ conf.h 1998/04/09 08:20:24 1.200
@@ -873,14 +873,6 @@
#include <regex.h>
#endif
-/* We always include the name-concealer file, even if stealth-mode
- * is off. This keeps the dependencies the same regardless of the
- * setting of the HIDE rule. hide.h either does its thing or not
- * internally depending on the rule, so it's safe to include under
- * all circumstances.
- */
-#include "hide.h"
-
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#ifdef SUNOS4
1.23 +18 -18 apache-1.3/src/main/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.tmpl 1998/03/28 11:58:21 1.22
+++ Makefile.tmpl 1998/04/09 08:20:26 1.23
@@ -58,29 +58,29 @@
# DO NOT REMOVE
alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \
- $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
$(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/multithread.h $(INCDIR)/http_log.h
buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \
- $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
$(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_main.h $(INCDIR)/http_log.h
fnmatch.o: fnmatch.c $(INCDIR)/conf.h ../os/unix/os.h \
- $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
+ $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h
gen_uri_delims.o: gen_uri_delims.c
http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_log.h $(INCDIR)/http_request.h \
$(INCDIR)/http_conf_globals.h $(INCDIR)/http_vhost.h \
$(INCDIR)/explain.h
http_core.o: http_core.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
@@ -89,12 +89,12 @@
$(INCDIR)/util_md5.h $(INCDIR)/md5.h $(INCDIR)/scoreboard.h \
$(INCDIR)/fnmatch.h
http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_log.h $(INCDIR)/http_main.h
http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
$(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
@@ -103,7 +103,7 @@
$(INCDIR)/util_script.h $(INCDIR)/scoreboard.h \
$(INCDIR)/multithread.h $(INCDIR)/explain.h
http_protocol.o: http_protocol.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
@@ -111,37 +111,37 @@
$(INCDIR)/http_log.h $(INCDIR)/util_date.h \
$(INCDIR)/http_conf_globals.h
http_request.o: http_request.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h
http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h \
$(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h
-md5c.o: md5c.c $(INCDIR)/conf.h ../os/unix/os.h $(INCDIR)/hide.h \
+md5c.o: md5c.c $(INCDIR)/conf.h ../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/md5.h
rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
$(INCDIR)/http_main.h
util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \
- $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
$(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h test_char.h
util_date.o: util_date.c $(INCDIR)/conf.h ../os/unix/os.h \
- $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/util_date.h
+ $(INCDIR)/hsregex.h $(INCDIR)/util_date.h
util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/util_md5.h $(INCDIR)/md5.h
util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
@@ -149,7 +149,7 @@
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
$(INCDIR)/util_script.h $(INCDIR)/util_date.h
util_uri.o: util_uri.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
$(INCDIR)/http_conf_globals.h uri_delims.h
1.2 +0 -2 apache-1.3/src/main/gen_test_char.mak
Index: gen_test_char.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/gen_test_char.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gen_test_char.mak 1998/03/30 13:55:01 1.1
+++ gen_test_char.mak 1998/04/09 08:20:26 1.2
@@ -202,7 +202,6 @@
"..\include\ap.h"\
"..\include\buff.h"\
"..\include\conf.h"\
- "..\include\hide.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
"..\include\util_uri.h"\
@@ -220,7 +219,6 @@
"..\include\ap.h"\
"..\include\buff.h"\
"..\include\conf.h"\
- "..\include\hide.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
"..\include\util_uri.h"\
1.7 +1 -1 apache-1.3/src/modules/experimental/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.tmpl 1998/03/28 12:06:55 1.6
+++ Makefile.tmpl 1998/04/09 08:20:27 1.7
@@ -16,7 +16,7 @@
# DO NOT REMOVE
mod_mmap_static.o: mod_mmap_static.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h \
1.11 +0 -12 apache-1.3/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===================================================================
RCS file:
/export/home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleProxy.mak 1998/04/06 05:21:42 1.10
+++ ApacheModuleProxy.mak 1998/04/09 08:20:27 1.11
@@ -206,7 +206,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -237,7 +236,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -265,7 +263,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -300,7 +297,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -331,7 +327,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -362,7 +357,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -390,7 +384,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -421,7 +414,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_main.h"\
@@ -448,7 +440,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -481,7 +472,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -511,7 +501,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -544,7 +533,6 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
1.11 +6 -6 apache-1.3/src/modules/proxy/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.tmpl 1998/03/23 07:28:40 1.10
+++ Makefile.tmpl 1998/04/09 08:20:28 1.11
@@ -57,14 +57,14 @@
# DO NOT REMOVE
mod_proxy.o: mod_proxy.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
$(INCDIR)/explain.h $(INCDIR)/http_log.h \
$(INCDIR)/http_vhost.h
proxy_cache.o: proxy_cache.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
@@ -72,20 +72,20 @@
$(INCDIR)/http_main.h $(INCDIR)/util_date.h \
$(INCDIR)/multithread.h $(INCDIR)/md5.h
proxy_connect.o: proxy_connect.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
$(INCDIR)/explain.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h
proxy_ftp.o: proxy_ftp.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
$(INCDIR)/explain.h $(INCDIR)/http_main.h
proxy_http.o: proxy_http.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
@@ -93,7 +93,7 @@
$(INCDIR)/http_main.h $(INCDIR)/http_core.h \
$(INCDIR)/util_date.h
proxy_util.o: proxy_util.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
1.13 +33 -33 apache-1.3/src/modules/standard/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.tmpl 1998/03/17 15:42:32 1.12
+++ Makefile.tmpl 1998/04/09 08:20:28 1.13
@@ -16,13 +16,13 @@
# DO NOT REMOVE
mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h \
$(INCDIR)/http_request.h
mod_actions.o: mod_actions.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_request.h \
@@ -30,43 +30,43 @@
$(INCDIR)/http_main.h $(INCDIR)/http_log.h \
$(INCDIR)/util_script.h
mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h
mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/util_script.h $(INCDIR)/http_main.h \
$(INCDIR)/http_request.h
mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
$(INCDIR)/http_request.h
mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_core.h \
@@ -74,13 +74,13 @@
$(INCDIR)/http_log.h $(INCDIR)/http_main.h \
$(INCDIR)/util_script.h
mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/util_script.h \
$(INCDIR)/http_log.h $(INCDIR)/http_request.h
mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
@@ -88,42 +88,42 @@
$(INCDIR)/http_log.h $(INCDIR)/util_script.h \
$(INCDIR)/http_conf_globals.h
mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \
$(INCDIR)/md5.h
mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/util_script.h
mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h
mod_expires.o: mod_expires.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h
mod_headers.o: mod_headers.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h
mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/util_script.h
mod_include.o: mod_include.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_request.h \
@@ -131,89 +131,89 @@
$(INCDIR)/http_log.h $(INCDIR)/http_main.h \
$(INCDIR)/util_script.h
mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
$(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h
mod_log_agent.o: mod_log_agent.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h
mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_log.h
mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h
mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h
mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_request.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
mod_negotiation.o: mod_negotiation.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_request.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/util_script.h
mod_rewrite.o: mod_rewrite.c mod_rewrite.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_request.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_vhost.h
mod_setenvif.o: mod_setenvif.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_log.h
mod_so.o: mod_so.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_log.h
mod_speling.o: mod_speling.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h
mod_status.o: mod_status.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- ../../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \
+ ../../os/unix/os.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
$(INCDIR)/http_main.h $(INCDIR)/util_script.h \
$(INCDIR)/scoreboard.h $(INCDIR)/http_log.h
mod_unique_id.o: mod_unique_id.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h \
$(INCDIR)/multithread.h
mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h
mod_usertrack.o: mod_usertrack.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/http_core.h
1.18 +3 -59 apache-1.3/src/modules/standard/mod_so.c
Index: mod_so.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_so.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_so.c 1998/03/31 12:53:21 1.17
+++ mod_so.c 1998/04/09 08:20:29 1.18
@@ -230,7 +230,6 @@
so_server_conf *sconf;
moduleinfo *modi;
moduleinfo *modie;
- char *modname_hidden;
int i;
/*
@@ -249,52 +248,6 @@
modi->name = modname;
/*
- * NOW COMES THE PROBLEMATIC PART:
- *
- * Because of the -DHIDE/hide.h feature of Apache 1.3 we have eight
- * situations from which four doesn't work at all and four are a bit
- * different because of the AP_ hiding stuff and the fact that this
symbol
- * hiding applies only to distributed modules.
- *
- * Apache ...... means the Apache code itself
- * S-Module .... means a standard module which is distributed with Apache
- * C-Module .... means a custom module which is not distributed with
Apache
- * HIDE ........ means -DHIDE was used when compiling
- * !HIDE ....... means -DHIDE was not used when compiling
- * xxx ......... means the symbol "<name>_module" of the module structure
- *
- * Resolving| dlopen() dlsym()
- * | (implicit) (explicit)
- * Situation | core->module core<-module
- * ------------------------------+-----------------------------------
- * The compatible variants: |
- * Apache+!HIDE & S-Module+!HIDE | succeeds succeeds only w/ xxx
- * Apache+ HIDE & S-Module+ HIDE | succeeds succeeds only w/ AP_xxx
- * Apache+!HIDE & C-Module+!HIDE | succeeds succeeds only w/ xxx
- * Apache+ HIDE & C-Module+ HIDE | succeeds succeeds only w/ xxx
<<==
- * The incompatible variants: |
- * Apache+!HIDE & S-Module+ HIDE | fails would succeed w/ AP_xxx
- * Apache+ HIDE & S-Module+!HIDE | fails would succeed w/ xxx
- * Apache+!HIDE & C-Module+ HIDE | fails would succeed w/ xxx
- * Apache+ HIDE & C-Module+!HIDE | fails would succeed w/ xxx
- *
- * In other words: For the incompatible variants where the Apache core
was
- * built with a different setting than the ones the module was compiled
- * with, we have no chance at all because the implicit resolving of
- * Apache's core symbols in dlopen() already fails for the module
(because
- * for instance the module needs palloc while Apache exports AP_palloc).
- *
- * So, only for the compatible variants we have a chance. And here we
- * succeed by always trying to resolve the plain xxx symbol and only for
- * the case of a distributed standard module we have to resolve via the
- * AP_xxx variant. Because we cannot decide if the module to be loaded is
- * a distributed one or a custom one we really have to try both: First
for
- * AP_xxx and if this fails additionally for xxx.
- *
- * -- rse
- */
-
- /*
* Load the file into the Apache address space
*/
if (!(modhandle = os_dl_load(szModuleFile))) {
@@ -308,17 +261,10 @@
"loaded module %s", modname);
/*
- * Create the symbol variant for the case where
- * we have to load a distributed module compiled with -DHIDE
- */
- modname_hidden = pstrcat(cmd->pool, "AP_", modname, NULL);
-
- /*
* Optionally prefix the symbol with an underscore
* for some platforms.
*/
#ifdef NEED_UNDERSCORE_SYM
- modname_hidden = pstrcat(cmd->pool, "_", modname_hidden, NULL);
modname = pstrcat(cmd->pool, "_", modname, NULL);
#endif
@@ -327,11 +273,9 @@
* First with the hidden variant (prefix `AP_') and then with the plain
* symbol name.
*/
- if (!(modp = (module *)(os_dl_sym (modhandle, modname_hidden)))) {
- if (!(modp = (module *)(os_dl_sym (modhandle, modname)))) {
- return pstrcat(cmd->pool, "Can't find module ", modname,
- " in file ", filename, ":", os_dl_error(), NULL);
- }
+ if (!(modp = (module *)(os_dl_sym (modhandle, modname)))) {
+ return pstrcat(cmd->pool, "Can't find module ", modname,
+ " in file ", filename, ":", os_dl_error(), NULL);
}
modi->modp = modp;
modp->dynamic_load_handle = modhandle;
1.7 +2 -2 apache-1.3/src/modules/test/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/Makefile.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.tmpl 1998/03/17 15:42:33 1.6
+++ Makefile.tmpl 1998/04/09 08:20:29 1.7
@@ -16,13 +16,13 @@
# DO NOT REMOVE
mod_rndchunk.o: mod_rndchunk.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_config.h \
$(INCDIR)/http_main.h
mod_test_util_uri.o: mod_test_util_uri.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hide.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_config.h \
1.17 +2 -2 apache-1.3/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.tmpl 1998/03/26 23:58:08 1.16
+++ Makefile.tmpl 1998/04/09 08:20:30 1.17
@@ -35,6 +35,6 @@
# DO NOT REMOVE
os-inline.o: os-inline.c $(INCDIR)/conf.h ../../os/unix/os.h \
- $(INCDIR)/hide.h $(INCDIR)/hsregex.h
+ $(INCDIR)/hsregex.h
os.o: os.c $(INCDIR)/conf.h ../../os/unix/os.h \
- $(INCDIR)/hide.h $(INCDIR)/hsregex.h os.h
+ $(INCDIR)/hsregex.h os.h
1.17 +0 -8 apache-1.3/src/os/unix/os.h
Index: os.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- os.h 1998/03/31 12:53:41 1.16
+++ os.h 1998/04/09 08:20:30 1.17
@@ -59,14 +59,6 @@
#define APACHE_OS_H
/*
- * We can't include conf.h (where the hide.h stuff is done) because it
- * includes us. So we do the hide.h stuff ourself.
- */
-#ifdef HIDE
-#include "hide.h"
-#endif
-
-/*
* This file in included in all Apache source code. It contains definitions
* of facilities available on _this_ operating system (HAVE_* macros),
* and prototypes of OS specific functions defined in os.c or os-inline.c
1.11 +0 -2 apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak
Index: ApacheModuleAuthAnon.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleAuthAnon.mak 1998/04/06 05:21:45 1.10
+++ ApacheModuleAuthAnon.mak 1998/04/09 08:20:31 1.11
@@ -186,7 +186,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -217,7 +216,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
1.11 +0 -2 apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak
Index: ApacheModuleCERNMeta.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleCERNMeta.mak 1998/04/06 05:21:45 1.10
+++ ApacheModuleCERNMeta.mak 1998/04/09 08:20:31 1.11
@@ -186,7 +186,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -216,7 +215,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
1.11 +0 -2 apache-1.3/src/os/win32/ApacheModuleDigest.mak
Index: ApacheModuleDigest.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleDigest.mak 1998/04/06 05:21:46 1.10
+++ ApacheModuleDigest.mak 1998/04/09 08:20:31 1.11
@@ -185,7 +185,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -217,7 +216,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
1.11 +0 -2 apache-1.3/src/os/win32/ApacheModuleExpires.mak
Index: ApacheModuleExpires.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleExpires.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleExpires.mak 1998/04/06 05:21:46 1.10
+++ ApacheModuleExpires.mak 1998/04/09 08:20:32 1.11
@@ -185,7 +185,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -213,7 +212,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
1.11 +0 -2 apache-1.3/src/os/win32/ApacheModuleHeaders.mak
Index: ApacheModuleHeaders.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleHeaders.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleHeaders.mak 1998/04/06 05:21:46 1.10
+++ ApacheModuleHeaders.mak 1998/04/09 08:20:32 1.11
@@ -185,7 +185,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\httpd.h"\
@@ -212,7 +211,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\httpd.h"\
1.8 +0 -1 apache-1.3/src/os/win32/ApacheModuleInfo.mak
Index: ApacheModuleInfo.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleInfo.mak,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApacheModuleInfo.mak 1998/04/06 05:21:47 1.7
+++ ApacheModuleInfo.mak 1998/04/09 08:20:32 1.8
@@ -180,7 +180,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_conf_globals.h"\
"..\..\include\http_config.h"\
1.11 +0 -1 apache-1.3/src/os/win32/ApacheModuleRewrite.mak
Index: ApacheModuleRewrite.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleRewrite.mak 1998/04/06 05:21:47 1.10
+++ ApacheModuleRewrite.mak 1998/04/09 08:20:32 1.11
@@ -216,7 +216,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
1.5 +0 -2 apache-1.3/src/os/win32/ApacheModuleSpeling.mak
Index: ApacheModuleSpeling.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleSpeling.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheModuleSpeling.mak 1998/04/06 05:21:48 1.4
+++ ApacheModuleSpeling.mak 1998/04/09 08:20:32 1.5
@@ -185,7 +185,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -214,7 +213,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
1.12 +0 -2 apache-1.3/src/os/win32/ApacheModuleStatus.mak
Index: ApacheModuleStatus.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheModuleStatus.mak 1998/04/06 05:21:48 1.11
+++ ApacheModuleStatus.mak 1998/04/09 08:20:33 1.12
@@ -185,7 +185,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -218,7 +217,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
1.11 +0 -2 apache-1.3/src/os/win32/ApacheModuleUserTrack.mak
Index: ApacheModuleUserTrack.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleUserTrack.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleUserTrack.mak 1998/04/06 05:21:49 1.10
+++ ApacheModuleUserTrack.mak 1998/04/09 08:20:33 1.11
@@ -186,7 +186,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -214,7 +213,6 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
- "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
1.6 +0 -3 apache-1.3/src/test/rename/README
Index: README
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README 1998/04/09 00:42:56 1.5
+++ README 1998/04/09 08:20:36 1.6
@@ -20,9 +20,6 @@
If we ever get around to doing this, here's the procedure
---------------------------------------------------------
- - completely remove HIDE stuff from
- src/Configure, include/*, APACI, etc.
-
- tag the source tree
$ cd apache-1.3
$ cvs tag PRE_AP_PREFIX_RENAME .
