cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
dgaudet 98/03/05 20:25:46
Modified:src/modules/standard mod_autoindex.c
Log:
indent
Revision ChangesPath
1.69 +2 -2 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mod_autoindex.c 1998/02/12 02:18:43 1.68
+++ mod_autoindex.c 1998/03/06 04:25:45 1.69
@@ -1150,8 +1150,8 @@
if (allow_opts OPT_INDEXES) {
/* KLUDGE --- make the sub_req lookups happen in the right directory.
-* Fixing this in the sub_req_lookup functions themselves is
difficult,
-* and would probably break virtual includes...
+ * Fixing this in the sub_req_lookup functions themselves is difficult,
+ * and would probably break virtual includes...
*/
if (r-filename[strlen(r-filename) - 1] != '/') {
cvs commit: apache-1.3/src/modules/proxy mod_proxy.c
dgaudet 98/03/05 23:51:00
Modified:src CHANGES
src/include httpd.h
src/modules/proxy mod_proxy.c
Log:
Fix a bug pointed out by Lars on new-httpd in message-id
[EMAIL PROTECTED]. I'm not sure how this ever worked
before. Luck I guess.
If a request matches the vhost of a proxy then it's quite possible that
various other modules such as mod_alias will get their grubby hands on
the uri and play games like Alias or ScriptAlias and then short-circuit
the translate_names phase before mod_proxy gets to handle
ProxyRequests on. So instead mod_proxy handles ProxyRequests on
in the post_read_request phase... which can't be short-circuited.
Revision ChangesPath
1.689 +5 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- CHANGES 1998/03/05 18:58:30 1.688
+++ CHANGES 1998/03/06 07:50:55 1.689
@@ -62,9 +62,13 @@
In order to achieve this change subtle changes were made to the API.
In a
request_rec, r-hostlen has been removed. r-unparsed_uri now exists so
that the unmodified uri can be retrieved easily. r-proxyreq is not set
- until the translate_names phase.
+ by the core, modules must set it during the post_read_request or
+ translate_names phase.
Plus changes to the virtualhost test suite for absoluteURI testing.
+
+ This fixes several bugs with the proxy proxying requests to vhosts
+ managed by the same httpd.
[Dean Gaudet]
*) Cleanup of code in http_vhost.c, and remove vhost matching code from
1.193 +2 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- httpd.h 1998/03/05 13:27:14 1.192
+++ httpd.h 1998/03/06 07:50:58 1.193
@@ -564,7 +564,8 @@
char *the_request; /* First line of request, so we can log
it */
int assbackwards;/* HTTP/0.9, simple request */
-int proxyreq;/* A proxy request (calculated during
translate_name) */
+int proxyreq;/* A proxy request (calculated during
+ * post_read_request or translate_name) */
int header_only; /* HEAD request, as opposed to GET */
char *protocol; /* Protocol, as given to us, or HTTP/0.9 */
int proto_num; /* Number version of protocol; 1.1 = 1001 */
1.45 +37 -11apache-1.3/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mod_proxy.c 1998/03/04 10:50:30 1.44
+++ mod_proxy.c 1998/03/06 07:50:59 1.45
@@ -121,13 +121,23 @@
return urip - uri;
}
-static int proxy_trans(request_rec *r)
+/* Detect if an absoluteURI should be proxied or not. Note that we
+ * have to do this during this phase because later phases are
+ * short-circuiting... i.e. translate_names will end when the first
+ * module returns OK. So for example, if the request is something like:
+ *
+ * GET http://othervhost/cgi-bin/printenv HTTP/1.0
+ *
+ * mod_alias will notice the /cgi-bin part and ScriptAlias it and
+ * short-circuit the proxy... just because of the ordering in the
+ * configuration file.
+ */
+static int proxy_detect(request_rec *r)
{
void *sconf = r-server-module_config;
-proxy_server_conf *conf =
-(proxy_server_conf *) get_module_config(sconf, proxy_module);
-int i, len;
-struct proxy_alias *ent = (struct proxy_alias *) conf-aliases-elts;
+proxy_server_conf *conf;
+
+conf = (proxy_server_conf *) get_module_config(sconf, proxy_module);
if (conf-req r-parsed_uri.scheme) {
/* but it might be something vhosted */
@@ -135,13 +145,29 @@
!strcasecmp(r-parsed_uri.scheme, http_method(r))
matches_request_vhost(r, r-parsed_uri.hostname,
r-parsed_uri.port_str ? r-parsed_uri.port :
default_port(r {
- r-proxyreq = 1;
- r-uri = r-unparsed_uri;
- r-filename = pstrcat(r-pool, proxy:, r-uri, NULL);
- r-handler = proxy-server;
- return OK;
+ r-proxyreq = 1;
+ r-uri = r-unparsed_uri;
+ r-filename = pstrcat(r-pool, proxy:, r-uri, NULL);
+ r-handler = proxy-server;
}
}
cvs commit: apache-1.3/src/main http_request.c
dgaudet 98/03/06 00:26:19
Modified:src/main http_request.c
Log:
No functional difference, other than to short-circuit earlier if there are
no Location sections. I wanted to do this before I made another change
which will have functional difference.
Revision ChangesPath
1.110 +43 -41apache-1.3/src/main/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- http_request.c1998/03/02 06:51:10 1.109
+++ http_request.c1998/03/06 08:26:18 1.110
@@ -499,58 +499,60 @@
void *per_dir_defaults = r-per_dir_config;
void **url = (void **) sconf-sec_url-elts;
int len, num_url = sconf-sec_url-nelts;
-char *test_location = pstrdup(r-pool, r-uri);
+char *test_location;
+void *this_conf, *entry_config;
+core_dir_config *entry_core;
+char *entry_url;
+int j;
+
+if (!num_url) {
+ return OK;
+}
/*
* Collapse multiple slashes, if it's a path URL (we don't want to do
* anything to Location http://... or such).
*/
+test_location = pstrdup(r-pool, r-uri);
if (test_location[0] == '/')
no2slash(test_location);
/* Go through the location entries, and check for matches. */
-if (num_url) {
-void *this_conf, *entry_config;
-core_dir_config *entry_core;
-char *entry_url;
-int j;
-
-/* we apply the directive sections in some order;
- * should really try them with the most general first.
- */
-for (j = 0; j num_url; ++j) {
-
-entry_config = url[j];
-
-entry_core = (core_dir_config *)
-get_module_config(entry_config, core_module);
-entry_url = entry_core-d;
-
-len = strlen(entry_url);
-
-this_conf = NULL;
-
-if (entry_core-r) {
-if (!regexec(entry_core-r, test_location, 0, NULL, 0))
-this_conf = entry_config;
-}
-else if (entry_core-d_is_fnmatch) {
-if (!fnmatch(entry_url, test_location, FNM_PATHNAME)) {
-this_conf = entry_config;
-}
-}
-else if (!strncmp(test_location, entry_url, len)
- (entry_url[len - 1] == '/' ||
- test_location[len] == '/' || test_location[len] == '\0'))
-this_conf = entry_config;
-
-if (this_conf)
-per_dir_defaults = merge_per_dir_configs(r-pool,
- per_dir_defaults, this_conf);
-}
-r-per_dir_config = per_dir_defaults;
+/* we apply the directive sections in some order;
+ * should really try them with the most general first.
+ */
+for (j = 0; j num_url; ++j) {
+
+ entry_config = url[j];
+
+ entry_core = (core_dir_config *)
+ get_module_config(entry_config, core_module);
+ entry_url = entry_core-d;
+
+ len = strlen(entry_url);
+
+ this_conf = NULL;
+
+ if (entry_core-r) {
+ if (!regexec(entry_core-r, test_location, 0, NULL, 0))
+ this_conf = entry_config;
+ }
+ else if (entry_core-d_is_fnmatch) {
+ if (!fnmatch(entry_url, test_location, FNM_PATHNAME)) {
+ this_conf = entry_config;
+ }
+ }
+ else if (!strncmp(test_location, entry_url, len)
+ (entry_url[len - 1] == '/' ||
+ test_location[len] == '/' || test_location[len] == '\0'))
+ this_conf = entry_config;
+
+ if (this_conf)
+ per_dir_defaults = merge_per_dir_configs(r-pool,
+ per_dir_defaults, this_conf);
}
+r-per_dir_config = per_dir_defaults;
return OK;
}
cvs commit: apache-1.3/src/modules/standard mod_mime_magic.c
dgaudet 98/03/06 00:52:02
Modified:src CHANGES
src/modules/standard mod_mime_magic.c
Log:
Slight mistake in mod_mime_magic. If you tried to request a 0-length file
it would return DONE all the way back to the core... which would interpret
that to mean oh no need to send any response.
Revision ChangesPath
1.690 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -r1.689 -r1.690
--- CHANGES 1998/03/06 07:50:55 1.689
+++ CHANGES 1998/03/06 08:51:58 1.690
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Fix bug with mod_mime_magic causing certain files, including files
+ of length 0, to result in no response from the server.
+ [Dean Gaudet]
+
*) The Configure script now generates src/include/ap_config.h which
contains the set of defines used when Apache is compiled on a platform.
This file can then be included by external modules before including
1.26 +1 -1 apache-1.3/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_mime_magic.c 1998/02/18 20:44:19 1.25
+++ mod_mime_magic.c 1998/03/06 08:52:01 1.26
@@ -844,7 +844,7 @@
switch ((result = fsmagic(r, r-filename))) {
case DONE:
magic_rsl_putchar(r, '\n');
- return result;
+ return OK;
case OK:
break;
default:
cvs commit: apache-1.3/htdocs/manual/mod core.html
dgaudet 98/03/06 01:37:11
Modified:src CHANGES
src/main http_request.c
htdocs/manual upgrading_to_1_3.html
htdocs/manual/mod core.html
Log:
Change to the multiple-slash behaviour of LocationMatch for consistency
with AliasMatch and RewriteRule. This was discussed in nh.9711, search
for subject mod_rewrite/1440. My proposed change had the support of
Roy, Ken and Dirk... I modified it slightly here so that it wouldn't
break every single existing config that has Location /server-status.
PR: 1440
Revision ChangesPath
1.691 +10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -r1.690 -r1.691
--- CHANGES 1998/03/06 08:51:58 1.690
+++ CHANGES 1998/03/06 09:37:04 1.691
@@ -1,5 +1,15 @@
Changes with Apache 1.3b6
+ *) Change to Location and LocationMatch semantics. LocationMatch no
+ longer lets a single slash match multiple adjacent slashes in the
+ URL. This change is for consistency with RewriteRule and
+ AliasMatch. Multiple slashes have meaning in URLs that they do
+ not have in (some) filesystems. Location on the other hand can
+ be considered a shorthand for a more complicated regex, and it
+ does match multiple slashes with a single slash -- which is
+ also consistent with the Alias directive.
+ [Dean Gaudet] related PR#1440
+
*) Fix bug with mod_mime_magic causing certain files, including files
of length 0, to result in no response from the server.
[Dean Gaudet]
1.111 +12 -7 apache-1.3/src/main/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- http_request.c1998/03/06 08:26:18 1.110
+++ http_request.c1998/03/06 09:37:06 1.111
@@ -509,13 +509,18 @@
return OK;
}
-/*
- * Collapse multiple slashes, if it's a path URL (we don't want to do
- * anything to Location http://... or such).
+/* Location and LocationMatch differ on their behaviour w.r.t. multiple
+ * slashes. Location matches multiple slashes with a single slash,
+ * LocationMatch doesn't. An exception, for backwards brokenness is
+ * absoluteURIs... in which case neither match multiple slashes.
*/
-test_location = pstrdup(r-pool, r-uri);
-if (test_location[0] == '/')
-no2slash(test_location);
+if (r-uri[0] != '/') {
+ test_location = r-uri;
+}
+else {
+ test_location = pstrdup(r-pool, r-uri);
+ no2slash(test_location);
+}
/* Go through the location entries, and check for matches. */
@@ -535,7 +540,7 @@
this_conf = NULL;
if (entry_core-r) {
- if (!regexec(entry_core-r, test_location, 0, NULL, 0))
+ if (!regexec(entry_core-r, r-uri, 0, NULL, 0))
this_conf = entry_config;
}
else if (entry_core-d_is_fnmatch) {
1.14 +5 -1 apache-1.3/htdocs/manual/upgrading_to_1_3.html
Index: upgrading_to_1_3.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- upgrading_to_1_3.html 1998/02/18 10:00:57 1.13
+++ upgrading_to_1_3.html 1998/03/06 09:37:07 1.14
@@ -77,7 +77,7 @@
AuthName This and That
/PRE
/P
-This change was made for HTTP/1.1 compliance.
+This change was made for consistency in the config language.
LISTRONGThe default Apache ServerRoot directory changed/STRONG
from the NCSA-compatible SAMP/usr/local/etc/httpd//SAMP to
SAMP/usr/local/apache//SAMP. This change covers only the default
@@ -131,6 +131,10 @@
inconsistancies, and was removed. To emulate this older behaviour
use a lt;Filesgt; section nested inside a lt;Directorygt;
section.
+
+ lilt;Locationgt; matching behaviour with respect to slashes has
+ changed. See the a href=mod/core.html#locationlt;Locationgt;
+ documentation/a for more info.
/UL
1.104 +40 -16apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- core.html 1998/02/20 06:52:03 1.103
+++
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/03/06 04:52:59
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Avoid the flock()-fork() problematic by giving each child an
own file descriptor instead of a shared one.
Revision ChangesPath
1.692 +11 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- CHANGES 1998/03/06 09:37:04 1.691
+++ CHANGES 1998/03/06 12:52:55 1.692
@@ -1,5 +1,16 @@
Changes with Apache 1.3b6
+ *) Fix one more special locking problem for RewriteMap programs in
+ mod_rewrite: According to the documentation of flock(), Locks are on
+ files, not file descriptors. That is, file descriptors duplicated
+ through dup(2) or fork(2) do not result in multiple instances of a lock,
+ but rather multiple references to a single lock. If a process holding a
+ lock on a file forks and the child explicitly unlocks the file, the
+ parent will lose its lock.. To overcome this we have to make sure the
+ RewriteLock file is opened _AFTER_ the childs were spawned which is now
+ the case by opening it in the child_init instead of the module_init API
+ hook. [Ralf S. Engelschall, PR#1029]
+
*) Change to Location and LocationMatch semantics. LocationMatch no
longer lets a single slash match multiple adjacent slashes in the
URL. This change is for consistency with RewriteRule and
1.87 +86 -29apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mod_rewrite.c 1998/03/05 12:42:37 1.86
+++ mod_rewrite.c 1998/03/06 12:52:57 1.87
@@ -193,7 +193,7 @@
hook_fixup, /* [#7] pre-run fixups */
NULL,/* [#9] log a transaction */
NULL,/* [#3] header parser */
- NULL,/* child_init */
+ init_child, /* child_init */
NULL,/* child_exit */
NULL /* [#0] post read-request */
};
@@ -869,7 +869,7 @@
/*
**
-** module initialisation
+** Global Module Initialization
** [called from read_config() after all
** config commands were already called]
**
@@ -877,26 +877,42 @@
static void init_module(server_rec *s, pool *p)
{
+/* check if proxy module is available */
+proxy_available = is_proxy_available(s);
+
+/* precompile a static pattern
+ for the txt mapfile parsing */
+lookup_map_txtfile_regexp = pregcomp(p, MAPFILE_PATTERN, REG_EXTENDED);
+
+/* create the rewriting lockfile in the parent */
+rewritelock_create(s, p);
+register_cleanup(p, (void *)s, rewritelock_remove, null_cleanup);
+
/* step through the servers and
* - open each rewriting logfile
- * - open each rewriting lockfile
* - open the RewriteMap prg:xxx programs
*/
for (; s; s = s-next) {
open_rewritelog(s, p);
-open_rewritelock(s, p);
run_rewritemap_programs(s, p);
}
+}
-/* create the lookup cache */
-cachep = init_cache(p);
-/* check if proxy module is available */
-proxy_available = is_proxy_available(s);
+/*
+**
+** Per-Child Module Initialization
+** [called after a child process is spawned]
+**
+*/
-/* precompile a static pattern
- for the txt mapfile parsing */
-lookup_map_txtfile_regexp = pregcomp(p, MAPFILE_PATTERN, REG_EXTENDED);
+static void init_child(server_rec *s, pool *p)
+{
+ /* open the rewriting lockfile */
+ rewritelock_open(s, p);
+
+ /* create the lookup cache */
+ cachep = init_cache(p);
}
@@ -2984,37 +3000,78 @@
** +---+
*/
-static void open_rewritelock(server_rec *s, pool *p)
-{
-rewrite_server_conf *conf;
-char *fname;
-intrewritelock_flags = ( O_WRONLY|O_APPEND|O_CREAT );
#ifdef WIN32
-mode_t rewritelock_mode = ( _S_IREAD|_S_IWRITE );
+#define REWRITELOCK_MODE ( _S_IREAD|_S_IWRITE )
#else
-mode_t rewritelock_mode = ( S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH );
+#define REWRITELOCK_MODE ( S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH )
#endif
+static void rewritelock_create(server_rec *s, pool *p)
+{
+
cvs commit: apache-1.3 STATUS
rse 98/03/06 04:57:38 Modified:.STATUS Log: Again cold days in germany... Revision ChangesPath 1.181 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- STATUS1998/03/06 12:43:51 1.180 +++ STATUS1998/03/06 12:57:37 1.181 @@ -69,6 +69,7 @@ * Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite * Ralf's fix for the `VirtualHost w/o mod_rewrite' situation. PR#1790 * Mark's fix for ProxyPass/ProxyRequests interaction broken by uri stuff +* Ralf's fix for the flock()-fork() problematic for RewriteLock's Available Patches:
cvs commit: apache-1.3/src/os/unix os.h
martin 98/03/06 05:16:19 Modified:src/os/unix os.h Log: This is disgusting - we must change the include order as soon as possible Revision ChangesPath 1.12 +1 -1 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -u -r1.11 -r1.12 --- os.h 1998/03/05 19:40:36 1.11 +++ os.h 1998/03/06 13:16:18 1.12 @@ -88,7 +88,7 @@ */ #if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ -defined(__bsdi__) || defined(IRIX) +defined(__bsdi__) || defined(IRIX) || defined(SNI) # define HAVE_DLFCN_H 1 #endif
cvs commit: apache-1.3/src/os/unix os.h
martin 98/03/06 05:18:45 Modified:src/os/unix os.h Log: SVR4 has dlfcn.h Revision ChangesPath 1.13 +1 -1 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- os.h 1998/03/06 13:16:18 1.12 +++ os.h 1998/03/06 13:18:44 1.13 @@ -88,7 +88,7 @@ */ #if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ -defined(__bsdi__) || defined(IRIX) || defined(SNI) +defined(__bsdi__) || defined(IRIX) || defined(SVR4) # define HAVE_DLFCN_H 1 #endif
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/03/06 05:47:42
Modified:src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Inline the proxy availability check because the existence of the function
is_proxy_available() is historical and from days where no find_linked_module()
function existed and where this was a bigger function.
Revision ChangesPath
1.88 +1 -13 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mod_rewrite.c 1998/03/06 12:52:57 1.87
+++ mod_rewrite.c 1998/03/06 13:47:40 1.88
@@ -878,7 +878,7 @@
static void init_module(server_rec *s, pool *p)
{
/* check if proxy module is available */
-proxy_available = is_proxy_available(s);
+proxy_available = (find_linked_module(mod_proxy.c) != NULL);
/* precompile a static pattern
for the txt mapfile parsing */
@@ -3783,18 +3783,6 @@
return 1;
else
return 0;
-}
-
-/*
-**
-** check if proxy module is available
-** i.e. if it is compiled in and turned on
-**
-*/
-
-static int is_proxy_available(server_rec *s)
-{
-return (find_linked_module(mod_proxy.c) != NULL);
}
1.48 +0 -3 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mod_rewrite.h 1998/03/06 12:52:58 1.47
+++ mod_rewrite.h 1998/03/06 13:47:41 1.48
@@ -458,9 +458,6 @@
static intprefix_stat(const char *path, struct stat *sb);
static void add_env_variable(request_rec *r, char *s);
-/* Proxy Module check */
-static int is_proxy_available(server_rec *s);
-
/* File locking */
static void fd_lock(int fd);
static void fd_unlock(int fd);
cvs commit: apache-1.3/src/main http_vhost.c
dgaudet 98/03/06 11:49:13
Modified:src/main http_vhost.c
Log:
tweak warnings for vhost stuff
Revision ChangesPath
1.10 +3 -2 apache-1.3/src/main/http_vhost.c
Index: http_vhost.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_vhost.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- http_vhost.c 1998/03/02 17:53:47 1.9
+++ http_vhost.c 1998/03/06 19:49:12 1.10
@@ -494,14 +494,15 @@
VirtualHost %s:%u -- mixing *
ports and non-* ports with
a NameVirtualHost address is not supported,
- you will get undefined behaviour,
+ proceeding with undefined results,
sar-virthost, sar-host_port);
}
}
else if (ic) {
aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, main_s,
VirtualHost %s:%u overlaps with
- VirtualHost %s:%u, the first has precedence,
+ VirtualHost %s:%u, the first has precedence,
+ perhaps you need a NameVirtualHost directive,
sar-virthost, sar-host_port,
ic-sar-virthost, ic-sar-host_port);
ic-sar = sar;
cvs commit: apache-1.3/src/include http_log.h
dgaudet 98/03/06 11:53:50 Modified:src/include http_log.h Log: Oh sheesh. No wonder we still get so many reports of problems from folks who haven't read the docs about NameVirtualHost. Those messages are warnings, because the server is still functioning. And the default loglevel is err. No way. Warnings should be in the default too. In fact I'd say everything except debug should be the default. Revision ChangesPath 1.26 +1 -1 apache-1.3/src/include/http_log.h Index: http_log.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_log.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- http_log.h1998/01/21 19:17:38 1.25 +++ http_log.h1998/03/06 19:53:50 1.26 @@ -91,7 +91,7 @@ #endif #ifndef DEFAULT_LOGLEVEL -#define DEFAULT_LOGLEVEL APLOG_ERR +#define DEFAULT_LOGLEVEL APLOG_WARNING #endif #define APLOG_MARK __FILE__,__LINE__
