cvs commit: apache-1.3/src/os/unix os.c
rse 98/04/19 05:25:22 Modified:src/os/unix os.c Log: Avoid warnings for discarded const under some platforms like OSF1 and FreeBSD 2.2.x where dlopen is defined to have a "char *" as its first argument instead of a "const char *". Revision ChangesPath 1.10 +5 -0 apache-1.3/src/os/unix/os.c Index: os.c === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- os.c 1998/04/13 18:05:19 1.9 +++ os.c 1998/04/19 12:25:22 1.10 @@ -26,7 +26,12 @@ handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L); return (void *)handle; #else +#if defined(OSF1) ||\ +(defined(__FreeBSD_version) && (__FreeBSD_version >= 22)) +return dlopen((char *)path, RTLD_NOW); +#else return dlopen(path, RTLD_NOW); +#endif #endif }
cvs commit: apache-1.3/src CHANGES
rse 98/04/19 05:31:28 Modified:.STATUS src CHANGES Log: Ops, forgot to commit the changelog entry. Revision ChangesPath 1.305 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- STATUS1998/04/18 10:54:53 1.304 +++ STATUS1998/04/19 12:31:26 1.305 @@ -45,6 +45,7 @@ * Lars' Configure fix to avoid confusing message under APACI control * Ralf's Configure fix for AWK's failing with "string to long" error * Ralf's fix for stderr logging to make sure default loglevel is honored +* Ralf's cast for dlopen's arg1 under OSF1 and FreeBSD 2.2.x Available Patches: 1.774 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.773 retrieving revision 1.774 diff -u -r1.773 -r1.774 --- CHANGES 1998/04/18 21:37:54 1.773 +++ CHANGES 1998/04/19 12:31:27 1.774 @@ -1,5 +1,9 @@ Changes with Apache 1.3b7 + *) PORT: Cast the first argument of dlopen() in ap_os_dso_load() + to `char *' under OSF1 and FreeBSD 2.x where it is defined this way + to avoid "discard const" warnings. [Ralf S. Engelschall] + *) If a specific handler is set for a file yet the request still ends up being handled by the default handler, log an error message before handling it. This catches things such as trying
cvs commit: apache-1.3/src CHANGES
rse 98/04/19 09:03:42 Modified:.STATUS configure src CHANGES Log: Fix "configure --prefix=/somewhere --compat" Submitted by: Lars Eilebrecht Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.306 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- STATUS1998/04/19 12:31:26 1.305 +++ STATUS1998/04/19 16:03:38 1.306 @@ -46,6 +46,7 @@ * Ralf's Configure fix for AWK's failing with "string to long" error * Ralf's fix for stderr logging to make sure default loglevel is honored * Ralf's cast for dlopen's arg1 under OSF1 and FreeBSD 2.2.x +* Lars' fix for the prefix setup on configure --compat Available Patches: 1.11 +0 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure 1998/04/15 10:03:46 1.10 +++ configure 1998/04/19 16:03:38 1.11 @@ -346,7 +346,6 @@ customized_includedir=1 ;; --compat) -prefix='/usr/local/apache' exec_prefix='$prefix' bindir='$exec_prefix/bin' sbindir='$exec_prefix/bin' 1.775 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.774 retrieving revision 1.775 diff -u -r1.774 -r1.775 --- CHANGES 1998/04/19 12:31:27 1.774 +++ CHANGES 1998/04/19 16:03:40 1.775 @@ -1,5 +1,9 @@ Changes with Apache 1.3b7 + *) Because /usr/local/apache is the default prefix the ``configure + --compat'' option no longer has to set prefix, again. This way the + --compat option honors a leading --prefix option. [Lars Eilebrecht] + *) PORT: Cast the first argument of dlopen() in ap_os_dso_load() to `char *' under OSF1 and FreeBSD 2.x where it is defined this way to avoid "discard const" warnings. [Ralf S. Engelschall]
cvs commit: apache-1.3/src/modules/standard mod_access.c
dgaudet 98/04/19 12:19:39
Modified:src CHANGES
src/ap ap_snprintf.c
src/include ap.h
src/modules/standard mod_access.c
Log:
add %pA, %pI, and %pp format codes
Reviewed by: Martin Kraemer
Revision ChangesPath
1.776 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -r1.775 -r1.776
--- CHANGES 1998/04/19 16:03:40 1.775
+++ CHANGES 1998/04/19 19:19:35 1.776
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) Add %pA, %pI, and %pp codes to ap_vformatter (and hence ap_bprintf,
+ ap_snprintf, and ap_psprintf). See include/ap.h for docs.
+ [Dean Gaudet]
+
*) Because /usr/local/apache is the default prefix the ``configure
--compat'' option no longer has to set prefix, again. This way the
--compat option honors a leading --prefix option. [Lars Eilebrecht]
1.19 +119 -37 apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ap_snprintf.c 1998/03/31 12:52:13 1.18
+++ ap_snprintf.c 1998/04/19 19:19:36 1.19
@@ -384,6 +384,43 @@
+static char *conv_in_addr(struct in_addr *ia, char *buf_end, int *len)
+{
+unsigned addr = ntohl(ia->s_addr);
+char *p = buf_end;
+bool_int is_negative;
+int sub_len;
+
+p = conv_10((addr & 0x00FF) , TRUE, &is_negative, p, &sub_len);
+*--p = '.';
+p = conv_10((addr & 0xFF00) >> 8, TRUE, &is_negative, p, &sub_len);
+*--p = '.';
+p = conv_10((addr & 0x00FF) >> 16, TRUE, &is_negative, p, &sub_len);
+*--p = '.';
+p = conv_10((addr & 0xFF00) >> 24, TRUE, &is_negative, p, &sub_len);
+
+*len = buf_end - p;
+return (p);
+}
+
+
+
+static char *conv_sockaddr_in(struct sockaddr_in *si, char *buf_end, int
*len)
+{
+char *p = buf_end;
+bool_int is_negative;
+int sub_len;
+
+p = conv_10(ntohs(si->sin_port), TRUE, &is_negative, p, &sub_len);
+*--p = ':';
+p = conv_in_addr(&si->sin_addr, p, &sub_len);
+
+*len = buf_end - p;
+return (p);
+}
+
+
+
/*
* Convert a floating point number to a string formats 'f', 'e' or 'E'.
* The result is placed in buf, and len denotes the length of the string
@@ -660,33 +697,27 @@
i_num = va_arg(ap, u_wide_int);
else
i_num = (wide_int) va_arg(ap, unsigned int);
- /*
- * The rest also applies to other integer formats, so fall
- * into that case.
- */
+ s = conv_10(i_num, 1, &is_negative,
+ &num_buf[NUM_BUF_SIZE], &s_len);
+ FIX_PRECISION(adjust_precision, precision, s, s_len);
+ break;
+
case 'd':
case 'i':
- /*
- * Get the arg if we haven't already.
- */
- if ((*fmt) != 'u') {
- if (is_long)
- i_num = va_arg(ap, wide_int);
- else
- i_num = (wide_int) va_arg(ap, int);
- };
- s = conv_10(i_num, (*fmt) == 'u', &is_negative,
+ if (is_long)
+ i_num = va_arg(ap, wide_int);
+ else
+ i_num = (wide_int) va_arg(ap, int);
+ s = conv_10(i_num, 0, &is_negative,
&num_buf[NUM_BUF_SIZE], &s_len);
FIX_PRECISION(adjust_precision, precision, s, s_len);
- if (*fmt != 'u') {
- if (is_negative)
- prefix_char = '-';
- else if (print_sign)
- prefix_char = '+';
- else if (print_blank)
- prefix_char = ' ';
- }
+ if (is_negative)
+ prefix_char = '-';
+ else if (print_sign)
+ prefix_char = '+';
+ else if (print_blank)
+ prefix_char = ' ';
break;
@@ -801,26 +832,77 @@
break;
/*
- * Always extract the argument as a "char *" pointer. We
- * should be using "void *" but there are still machines
- * that don't understand it.
- * If the pointer size is equal to the size of an unsigned
- * integer we convert the pointer to a hex number, otherwise
-
cvs commit: apache-1.3/src/support httpd.8
dgaudet 98/04/19 13:10:49 Modified:htdocs/manual invoking.html new_features_1_3.html htdocs/manual/vhosts index.html src CHANGES src/include http_conf_globals.h httpd.h src/main http_core.c http_main.c http_vhost.c src/support httpd.8 Log: This should help folks trying to understand vhosts. It adds the command line option -S which dumps a description of how apache parsed the vhost directives. In particular it'd really help the folks who recently ran into /etc/hosts mismatches with DNS. Revision ChangesPath 1.18 +4 -0 apache-1.3/htdocs/manual/invoking.html Index: invoking.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/invoking.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- invoking.html 1998/02/05 20:04:10 1.17 +++ invoking.html 1998/04/19 20:10:41 1.18 @@ -59,6 +59,10 @@ -l Give a list of all modules compiled into the server. +-S +Show the settings as parsed from the config file (currently only +shows a breakdown of the vhost settings). + -? Print a list of the httpd options, and then exit. 1.53 +7 -0 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- new_features_1_3.html 1998/04/01 12:23:13 1.52 +++ new_features_1_3.html 1998/04/19 20:10:42 1.53 @@ -626,6 +626,13 @@ outside the Apache source tree. To achieve this APACI installs the Apache C header files together with the apxs tool. + -S command line option for debugging vhost setup + + If Apache is invoked with the -S command line option it will + dump out information regarding how it parsed the VirtualHost + sections. This is useful for folks trying to debug their virtual host + configuration. + 1.3 +6 -0 apache-1.3/htdocs/manual/vhosts/index.html Index: index.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/vhosts/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.html1998/01/26 16:54:34 1.2 +++ index.html1998/04/19 20:10:43 1.3 @@ -53,6 +53,12 @@ ServerPath +Folks trying to debug their virtual host configuration may find the +Apache -S command line switch useful. It will dump out a +description of how Apache parsed the configuration file. Careful +examination of the IP addresses and server names may help uncover +configuration mistakes. + 1.777 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.776 retrieving revision 1.777 diff -u -r1.776 -r1.777 --- CHANGES 1998/04/19 19:19:35 1.776 +++ CHANGES 1998/04/19 20:10:43 1.777 @@ -1,5 +1,10 @@ Changes with Apache 1.3b7 + *) If you start apache with the -S command line option it will dump + out the parsed vhost settings. This is useful for folks trying + to figure out what is wrong with their vhost configuration. + (Other dumps may be added in the future.) [Dean Gaudet] + *) Add %pA, %pI, and %pp codes to ap_vformatter (and hence ap_bprintf, ap_snprintf, and ap_psprintf). See include/ap.h for docs. [Dean Gaudet] 1.28 +1 -0 apache-1.3/src/include/http_conf_globals.h Index: http_conf_globals.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_conf_globals.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- http_conf_globals.h 1998/04/11 12:00:19 1.27 +++ http_conf_globals.h 1998/04/19 20:10:44 1.28 @@ -80,6 +80,7 @@ extern int ap_daemons_limit; extern MODULE_VAR_EXPORT int ap_suexec_enabled; extern int ap_listenbacklog; +extern int ap_dump_settings; extern char *ap_pid_fname; extern char *ap_scoreboard_fname; 1.206 +4 -0 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.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- httpd.h 1998/04/16 00:19:39 1.205 +++ httpd.h 1998/04/19 20:10:45 1.206 @@ -753,6 +753,10 @@ server_re
