cvs commit: apache/src Configuration.tmpl
dgaudet 97/10/21 17:18:44 Modified:src Tag: APACHE_1_2_X Configuration.tmpl Log: PR#1279: Documentation sucks. Modules are listed in reverse priority order, not priority order. (already fixed in 1.3) Revision ChangesPath No revision No revision 1.63.2.1 +2 -2 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.63 retrieving revision 1.63.2.1 diff -u -r1.63 -r1.63.2.1 --- Configuration.tmpl1997/05/10 17:14:36 1.63 +++ Configuration.tmpl1997/10/22 00:18:43 1.63.2.1 @@ -18,8 +18,8 @@ # control Configure's behavior as far as how to create Makefile. # # Module selection lines, distinguished by having 'Module' at the front. -# These list the configured modules, in priority order (highest priority -# first). They're down at the bottom. +# These list the configured modules, in reverse priority order (lowest +# priority first). They're down at the bottom. # # Optional module selection lines, distinguished by having `%Module' # at the front. These specify a module that is to be compiled in (but
cvs commit: apachen/src/support suexec.c
rse 97/10/22 00:43:38 Modified:src/support suexec.c Log: Fix PR#1284: make Apache environment-variable UNIQUE_ID from mod_unique_id available to suexec'd CGI programs, too. PR: 1284 Reviewed by: Ralf S. Engelschall, Martin Kraemer, Jason A. Dour [EMAIL PROTECTED] Revision ChangesPath 1.28 +1 -0 apachen/src/support/suexec.c Index: suexec.c === RCS file: /export/home/cvs/apachen/src/support/suexec.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- suexec.c 1997/10/09 22:34:34 1.27 +++ suexec.c 1997/10/22 07:43:37 1.28 @@ -148,6 +148,7 @@ SERVER_PORT, SERVER_PROTOCOL, SERVER_SOFTWARE, +UNIQUE_ID, USER_NAME, TZ, NULL
cvs commit: apachen/src CHANGES
rse 97/10/22 00:57:53 Modified:src CHANGES Log: Entry for UNIQUE_ID patch. Revision ChangesPath 1.469 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.468 retrieving revision 1.469 diff -u -r1.468 -r1.469 --- CHANGES 1997/10/18 13:07:42 1.468 +++ CHANGES 1997/10/22 07:57:52 1.469 @@ -1,5 +1,9 @@ Changes with Apache 1.3b3 + *) Add support to suexec wrapper program for mod_unique_id's UNIQUE_ID + variable to provide this one to suexec'd CGIs, too. + [Ralf S. Engelschall] PR#1284 + *) New support tool: src/support/split-logfile, a sample Perl script which splits up a combined access log into separate files based on the name of the virtual host (listed first in the log records by %v).
cvs commit: apachen/src CHANGES
martin 97/10/22 01:26:51 Modified:src CHANGES Log: Document my config parsing changes Revision ChangesPath 1.470 +6 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apachen/src/CHANGES,v retrieving revision 1.469 retrieving revision 1.470 diff -u -u -r1.469 -r1.470 --- CHANGES 1997/10/22 07:57:52 1.469 +++ CHANGES 1997/10/22 08:26:50 1.470 @@ -1,5 +1,11 @@ Changes with Apache 1.3b3 + *) Various improvements in detecting config file errors (missing closing + directives for Directory, Files etc. blocks, prohibiting global + server settings in VirtualHost blocks, flagging unhandled multiple + arguments to Directory, Files etc.) + [Martin Kraemer] + *) Add support to suexec wrapper program for mod_unique_id's UNIQUE_ID variable to provide this one to suexec'd CGIs, too. [Ralf S. Engelschall] PR#1284
cvs commit: apachen README.NT
pcs 97/10/22 06:16:36 Modified:.README.NT Log: Make this readme into a proper file instead of a series of out-of-date notes. Format is the same as the existing Unix README file. Add various documentation about installation, current bugs, etc. Revision ChangesPath 1.4 +114 -145 apachen/README.NT Index: README.NT === RCS file: /export/home/cvs/apachen/README.NT,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.NT 1997/08/23 04:48:48 1.3 +++ README.NT 1997/10/22 13:16:36 1.4 @@ -1,121 +1,57 @@ -NOTE - About this File -== + Apache for Windows + Version 1.3 (and up) -This file contains development information on Apache for Windows, not all -of which is relevant to the current version. For information on -installation and use of Apache for Windows, please see -http://www.apache.org/docs/windows.html, also available as -htdocs/manual/windows.html with this distribution. - -Alexei Kosut [EMAIL PROTECTED] - July 21, 1997 - -WARNING: Apache on NT has not yet been optimized for performance. -Apache still performs best, and is most reliable on Unix platforms. -Over time we will improve NT performance. Folks doing comparative reviews -of webserver performance are asked to compare against Apache on a Unix -platform such as Solaris, FreeBSD, or Linux. - -Integration with official Apache sources - - -Ben Laurie [EMAIL PROTECTED] - -Starting with a port to NT by Ambarish Malpani (see below). - -Things done +What is it? --- -1. Move NT-specific stuff to the NT subdirectory - -2. Eliminate code under incompatible licenses. - -3. Rearrange changes to minimise the patch. - -4. Add pregenerated modules.c to NT dir, for now. - -5. Include nt/ files directly, rather than building a library. - -6. Remove gratuitous layout changes. - -7. Fold in missing updates. - -8. Add in mod_info.c (not tested). - -9. Made a start on mod_rewrite.c, brought back into line with current source. - -10. Remove copy of environment in util_script.c, presumably introduced through -a misunderstanding. - -11. Replace crypt with a null function. - -Things to do - - -1. Make regex generate *.ih headers. - -2. Use Configuration to generate modules.c. - -3. Consider including regex/ directly, rather than building a library. - -4. Make multithread routines null #defines rather than null functions when - not multithreading. - -5. Change __declspec(thread) to APACHE_TLS throughout. - -6. Tidy up http_main.c. - -7. Update OS/2 comments to mention Win32 where appropriate - -8. Abstract log children! - -9. Wonder why bytes in mod_negotiation is a float? - -10. Fix the 3 zillion warnings we get under VC++. - -11. Replace crypt(). - -Apache on Windows NT - - -Ambarish Malpani [EMAIL PROTECTED] - - -This document consists of my goobly-gook, over and above all the wonderful -Apache related writeups available in other places (including this directory). - -Finally, a Web server that can run on Windows NT Workstation and Windows 95 -and a FREE proxy server!!! - -This is a port of Apache to Windows NT. I have basically used the sources -from Apache 1.2b10. +Apache is an HTTP server, originally designed for Unix systems. This +is the first release of Apache for Windows systems. Like the Unix +version, it includes many frequently requested new features, and has +an API which allows it to be extended to meet users' needs more +easily. It also allows ISAPI extensions. + +Documentation +- + +The documentation available as of the date of this release is also +included, in HTML format, in the htdocs/manual/ directory. For the +most up-to-date documentation, visit us on the WWW, at +http://www.apache.org/. For Window's specific information, see +http://www.apache.org/docs/windows.html. + +WARNING +--- + +Apache on NT has not yet been optimized for performance. Apache still +performs best, and is most reliable on Unix platforms. Over time we +will improve NT performance. Folks doing comparative reviews of +webserver performance are asked to compare against Apache on a Unix +platform such as Solaris, FreeBSD, or Linux. -I have put out the sources on: +Changes for the Windows version +--- -ftp://valicert.com/pub/apache_1_2b10_nt.tar.gz. These same sources will -compile on Unix, but you will need to remove the \r from the \r\n at -the end of ever text file. +1. It is multithreaded -Stuff specific to the NT version:
cvs commit: apachen README.NT
pcs 97/10/22 06:19:28 Modified:.README.NT Log: Remove the known problems that have been fixed. Add uninstall information. Revision ChangesPath 1.5 +10 -8 apachen/README.NT Index: README.NT === RCS file: /export/home/cvs/apachen/README.NT,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.NT 1997/10/22 13:16:36 1.4 +++ README.NT 1997/10/22 13:19:27 1.5 @@ -110,13 +110,14 @@ Running Apache -- -On NT, Apache can run as either a service or a regular executable. +Apache can run as either a service (NT only) or a regular executable. To run as an executable, simply run \Apache\apache from the command line. This will print the version number, then wait to serve requests. To stop Apache, press Control-C to stop it running. Note that there may be a delay between typing the command line and Apache -being ready to accept requests. This method also works on Windows 95. +being ready to accept requests as it checks the service manager. Use +the -s option to prevent this delay. To run as a service, first install the service with @@ -130,6 +131,13 @@ \Apache\apache -u +Uninstalling Apache +--- + +To uninstall Apache, use the normal method of removing programs (Start +menu, Control Panel, Add/Remove Programs). You may have to remove the +directory manually because of the configuration files. + Known Problems -- @@ -146,12 +154,6 @@ accepted by it are aborted. - Problem with very long running cgi scripts (their output is garbled?) - -- There are problems with the way the program handles cgi scripts that - it doesn't successfully spawn. - -- On Windows 95, there is a problem spawning cgi script since - Windows 95 requires \'s in the path (unlike NT, which accepts /'s). - regex does not generate *.ih headers.
cvs commit: apachen README.NT
pcs 97/10/22 06:30:03 Modified:.README.NT Log: Add license reference and acknowledgements from README. Typos and language changes. Revision ChangesPath 1.6 +36 -7 apachen/README.NT Index: README.NT === RCS file: /export/home/cvs/apachen/README.NT,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README.NT 1997/10/22 13:19:27 1.5 +++ README.NT 1997/10/22 13:30:02 1.6 @@ -16,7 +16,7 @@ The documentation available as of the date of this release is also included, in HTML format, in the htdocs/manual/ directory. For the most up-to-date documentation, visit us on the WWW, at -http://www.apache.org/. For Window's specific information, see +http://www.apache.org/. For Windows specific information, see http://www.apache.org/docs/windows.html. WARNING @@ -38,9 +38,9 @@ the program to hook up to the Service Manager). On Windows 95 it runs as a regular program. -3. It executes as multiple servers (this allows for some fault tolerance - +3. It executes as multiple processes (this allows for some fault tolerance - if a server dies, another one takes its place. Also after dealing - with a certain number of requests, a server voluntarily exits, to + with a certain number of requests, each process voluntarily exits, to clean up any resources it might have forgotten to free up). By default Apache uses the directory \Apache for the ServerRoot ON THE @@ -87,7 +87,7 @@ nmake -f Makefile.nt installr -You cannot easily set a different installation directory. You can also +You cannot easily use a different installation directory. You can also build debug versions of Apache, with the targets _apached and installd. @@ -134,9 +134,13 @@ Uninstalling Apache --- -To uninstall Apache, use the normal method of removing programs (Start -menu, Control Panel, Add/Remove Programs). You may have to remove the -directory manually because of the configuration files. +If you installed a binary release, you can uninstall Apache using the +normal method of removing programs (Start menu, Control Panel, +Add/Remove Programs). You may have to remove the directory manually +because of the configuration files. + +If you installed a source release, you should delete the directory +where you installed Apache (normally \Apache). Known Problems -- @@ -162,3 +166,28 @@ - htpasswd passwords are stored in plain text because Windows lacks a crypt() function +Licensing +- + +Please see the file called LICENSE. + +Acknowledgments + + +We wish to acknowledge the following copyrighted works that make up +portions of the Apache software: + +Portions of this software were developed at the National Center for +Supercomputing Applications at the University of Illinois at +Urbana-Champaign. + +This software contains code derived from the RSA Data Security Inc. MD5 +Message-Digest Algorithm, including various modifications by Spyglass Inc., +Carnegie Mellon University, and Bell Communications Research, Inc. +(Bellcore). + +This package contains software written and copyrighted by Henry Spencer. +Please see the file called src/regex/COPYRIGHT. + +The NT port was started with code provided to the Apache Group +by Ambarish Malpani of ValiCert, Inc. (www.valicert.com).
cvs commit: apachen/src/main http_main.c
dgaudet 97/10/22 09:43:06
Modified:src/main http_main.c
Log:
indent screwed up the indentation a bit
Revision ChangesPath
1.236 +2 -2 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- http_main.c 1997/10/15 00:14:31 1.235
+++ http_main.c 1997/10/22 16:43:05 1.236
@@ -3005,7 +3005,7 @@
*/
case SERVER_STARTING:
case SERVER_READY:
- ++ idle_count;
+ ++ idle_count;
/* always kill the highest numbered child if we have to...
* no really well thought out reason ... other than observing
* the server behaviour under linux where lower numbered children
@@ -3016,7 +3016,7 @@
break;
case SERVER_DEAD:
/* try to keep children numbers as low as possible */
- if (free_length idle_spawn_rate) {
+ if (free_length idle_spawn_rate) {
free_slots[free_length] = i;
++free_length;
}
cvs commit: apachen/src/modules/standard mod_speling.c
dgaudet 97/10/22 09:57:36
Modified:src/modules/standard mod_speling.c
Log:
Fix some 64-bit warnings.
Reviewed by: Dean Gaudet, Martin Kraemer, Jim Jagielski
Revision ChangesPath
1.7 +4 -3 apachen/src/modules/standard/mod_speling.c
Index: mod_speling.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_speling.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_speling.c 1997/10/20 13:28:02 1.6
+++ mod_speling.c 1997/10/22 16:57:34 1.7
@@ -91,11 +91,12 @@
{
void *server_conf = cmd-server-module_config;
-set_module_config(server_conf, speling_module, (void *) arg);
+/* any non-NULL pointer means speling is enabled */
+set_module_config(server_conf, speling_module, arg ? (void
*)speling_module : NULL);
return NULL;
}
-command_rec speling_cmds[] =
+static command_rec speling_cmds[] =
{
{CheckSpelling, set_speling, NULL, RSRC_CONF, FLAG,
whether or not to fix miscapitalized/misspelled requests},
@@ -183,7 +184,7 @@
struct DIR_TYPE *dir_entry;
array_header *candidates = NULL;
-if (!(int) get_module_config(server_conf, speling_module))
+if (!get_module_config(server_conf, speling_module))
return DECLINED;
/* We only want to worry about GETs */
cvs commit: apachen/src/modules/standard mod_autoindex.c mod_dir.c
dgaudet 97/10/22 09:59:24 Modified:src/modules/standard mod_autoindex.c mod_dir.c Log: When method is not GET, just DECLINE rather than return NOT_IMPLEMENTED. PR: 1241 Reviewed by: Dean Gaudet, Jim Jagielski, Martin Kraemer Revision ChangesPath 1.52 +1 -1 apachen/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- mod_autoindex.c 1997/10/16 18:55:51 1.51 +++ mod_autoindex.c 1997/10/22 16:59:22 1.52 @@ -1104,7 +1104,7 @@ int allow_opts = allow_options(r); if (r-method_number != M_GET) - return NOT_IMPLEMENTED; + return DECLINED; /* OK, nothing easy. Trot out the heavy artillery... */ 1.42 +1 -1 apachen/src/modules/standard/mod_dir.c Index: mod_dir.c === RCS file: /export/home/cvs/apachen/src/modules/standard/mod_dir.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- mod_dir.c 1997/09/18 18:40:51 1.41 +++ mod_dir.c 1997/10/22 16:59:23 1.42 @@ -182,7 +182,7 @@ return error_notfound; if (r-method_number != M_GET) -return NOT_IMPLEMENTED; +return DECLINED; /* nothing for us to do, pass on through */
cvs commit: apachen/src/main http_core.c
dgaudet 97/10/22 10:08:49
Modified:src/main http_core.c
Log:
Tweak the descriptions a bit.
Revision ChangesPath
1.130 +2 -2 apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- http_core.c 1997/10/21 21:45:12 1.129
+++ http_core.c 1997/10/22 17:08:47 1.130
@@ -1485,7 +1485,7 @@
{ /Directory, end_dirsection, NULL, ACCESS_CONF, NO_ARGS, Marks end of
Directory },
{ Location, urlsection, NULL, RSRC_CONF, RAW_ARGS, Container for
directives affecting resources accessed through the specified URL paths },
{ /Location, end_urlsection, NULL, ACCESS_CONF, NO_ARGS, Marks end of
Location },
-{ VirtualHost, virtualhost_section, NULL, RSRC_CONF, RAW_ARGS, Container
to map directives to a particular virtual host },
+{ VirtualHost, virtualhost_section, NULL, RSRC_CONF, RAW_ARGS, Container
to map directives to a particular virtual host, takes one or more host
addresses },
{ /VirtualHost, end_virtualhost_section, NULL, RSRC_CONF, NO_ARGS,
Marks end of Directory },
{ Files, filesection, NULL, OR_ALL, RAW_ARGS, Container for directives
affecting files matching specified patterns },
{ /Files, end_filesection, NULL, OR_ALL, NO_ARGS, Marks end of Files
},
@@ -1601,7 +1601,7 @@
{ Include, include_config, NULL, RSRC_CONF, TAKE1, config file to be
included },
{ LogLevel, set_loglevel, NULL, RSRC_CONF, TAKE1, set level of verbosity
in error logging },
{ NameVirtualHost, set_name_virtual_host, NULL, RSRC_CONF, TAKE1,
- a numeric ip address:port, or the name of a host with a single address },
+ a numeric ip address:port, or the name of a host },
{ NULL },
};
cvs commit: apachen/src/support apachectl dbmmanage htpasswd.1 httpd.8 log_server_status suexec.c suexec.h
martin 97/10/22 13:30:49 Modified:src/main alloc.c alloc.h buff.c buff.h conf.h http_conf_globals.h http_config.c http_config.h http_core.c http_core.h http_log.c http_log.h http_main.c http_main.h http_protocol.c http_protocol.h http_request.c http_request.h http_vhost.c http_vhost.h httpd.h md5.h md5c.c rfc1413.c rfc1413.h scoreboard.h util.c util_date.c util_date.h util_md5.c util_md5.h util_script.c util_script.h util_snprintf.c src/modules/example mod_example.c src/modules/proxy mod_proxy.c mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c proxy_util.c src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_dir.c mod_dld.c mod_env.c mod_expires.c mod_headers.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_rewrite.h mod_setenvif.c mod_speling.c mod_status.c mod_unique_id.c mod_userdir.c mod_usertrack.c src/os/win32 mod_dll.c mod_isapi.c src/support apachectl dbmmanage htpasswd.1 httpd.8 log_server_status suexec.c suexec.h Log: Added apache EMail address to all Apache License Headers Revision ChangesPath 1.55 +2 -1 apachen/src/main/alloc.c Index: alloc.c === RCS file: /home/cvs/apachen/src/main/alloc.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -u -r1.54 -r1.55 --- alloc.c 1997/10/20 20:31:58 1.54 +++ alloc.c 1997/10/22 20:29:31 1.55 @@ -20,7 +20,8 @@ * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without - *prior written permission. + *prior written permission. For written permission, please contact + *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: 1.35 +2 -1 apachen/src/main/alloc.h Index: alloc.h === RCS file: /home/cvs/apachen/src/main/alloc.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -u -r1.34 -r1.35 --- alloc.h 1997/09/14 11:36:33 1.34 +++ alloc.h 1997/10/22 20:29:32 1.35 @@ -21,7 +21,8 @@ * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without - *prior written permission. + *prior written permission. For written permission, please contact + *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: 1.47 +2 -1 apachen/src/main/buff.c Index: buff.c === RCS file: /home/cvs/apachen/src/main/buff.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -u -r1.46 -r1.47 --- buff.c1997/09/25 01:03:19 1.46 +++ buff.c1997/10/22 20:29:32 1.47 @@ -20,7 +20,8 @@ * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without - *prior written permission. + *prior written permission. For written permission, please contact + *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: 1.27 +2 -1 apachen/src/main/buff.h Index: buff.h === RCS file: /home/cvs/apachen/src/main/buff.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -u -r1.26 -r1.27 --- buff.h1997/10/07 05:38:45 1.26 +++ buff.h1997/10/22 20:29:33 1.27 @@ -20,7 +20,8 @@ * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without - *prior written permission. + *prior written permission. For written permission, please contact + *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: 1.149 +2 -1
cvs commit: apachen/src/main http_core.c
martin 97/10/22 14:49:47
Modified:src/main http_core.c
Log:
The global variables which exist in http_core belong to the
main server and should not be settable in VirtualHosts, otherwise
users believe that virtual hosts each use a separate variable.
Reviewed by: Martin +1, Ralf +1, Dean +1
Revision ChangesPath
1.132 +26 -0 apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -u -r1.131 -r1.132
--- http_core.c 1997/10/22 20:29:37 1.131
+++ http_core.c 1997/10/22 21:49:45 1.132
@@ -1079,6 +1079,8 @@
const char *server_type (cmd_parms *cmd, void *dummy, char *arg)
{
+if (cmd-server-is_virtual)
+ return ServerType directive not allowed in VirtualHost;
if (!strcasecmp (arg, inetd)) standalone = 0;
else if (!strcasecmp (arg, standalone)) standalone = 1;
else return ServerType must be either 'inetd' or 'standalone';
@@ -1154,6 +1156,8 @@
}
const char *set_server_root (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return ServerRoot directive not allowed in VirtualHost;
if (!is_directory (arg)) return ServerRoot must be a valid directory;
strncpy (server_root, arg, sizeof(server_root)-1);
server_root[sizeof(server_root)-1] = '\0';
@@ -1187,16 +1191,22 @@
}
const char *set_pidfile (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return PidFile directive not allowed in VirtualHost;
pid_fname = pstrdup (cmd-pool, arg);
return NULL;
}
const char *set_scoreboard (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return ScoreBoardFile directive not allowed in VirtualHost;
scoreboard_fname = pstrdup (cmd-pool, arg);
return NULL;
}
const char *set_lockfile (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return LockFile directive not allowed in VirtualHost;
lock_fname = pstrdup (cmd-pool, arg);
return NULL;
}
@@ -1232,11 +1242,15 @@
}
const char *set_daemons_to_start (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return StartServers directive not allowed in VirtualHost;
daemons_to_start = atoi (arg);
return NULL;
}
const char *set_min_free_servers (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return MinSpareServers directive not allowed in VirtualHost;
daemons_min_free = atoi (arg);
if (daemons_min_free = 0) {
fprintf(stderr, WARNING: detected MinSpareServers set to
non-positive.\n);
@@ -1249,11 +1263,15 @@
}
const char *set_max_free_servers (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return MaxSpareServers directive not allowed in VirtualHost;
daemons_max_free = atoi (arg);
return NULL;
}
const char *set_server_limit (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return MaxClients directive not allowed in VirtualHost;
daemons_limit = atoi (arg);
if (daemons_limit HARD_SERVER_LIMIT) {
fprintf(stderr, WARNING: MaxClients of %d exceeds compile time limit
@@ -1270,16 +1288,22 @@
}
const char *set_max_requests (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return MaxRequestsPerChild directive not allowed in VirtualHost;
max_requests_per_child = atoi (arg);
return NULL;
}
const char *set_threads (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return ThreadsPerChild directive not allowed in VirtualHost;
threads_per_child = atoi (arg);
return NULL;
}
const char *set_excess_requests (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return ExcessRequestsPerChild directive not allowed in VirtualHost;
excess_requests_per_child = atoi (arg);
return NULL;
}
@@ -1373,6 +1397,8 @@
#endif
const char *set_bind_address (cmd_parms *cmd, void *dummy, char *arg) {
+if (cmd-server-is_virtual)
+ return BindAddress directive not allowed in VirtualHost;
bind_address.s_addr = get_virthost_addr (arg, NULL);
return NULL;
}
