cvs commit: apache-1.3/src/main http_log.c
marc98/10/22 17:34:21 Modified:src/main http_log.c Log: apache -- Apache in log message. Revision ChangesPath 1.73 +1 -1 apache-1.3/src/main/http_log.c Index: http_log.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- http_log.c1998/10/03 14:28:55 1.72 +++ http_log.c1998/10/23 00:34:20 1.73 @@ -481,7 +481,7 @@ */ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, NULL, ap_psprintf(p, -pid file %s overwritten -- Unclean shutdown of previous apache run?, +pid file %s overwritten -- Unclean shutdown of previous Apache run?, fname) ); }
cvs commit: apache-1.3/src CHANGES Configure
rse 98/10/22 23:50:39
Modified:src CHANGES Configure
Log:
Add DSO support for UnixWare 7 platform.
PS: Actually I merged all UnixWare DSO cases into one because DSO
linker/compiler flags for all UnixWare 2.x and 7.x versions are identical.
Revision ChangesPath
1.1117+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1116
retrieving revision 1.1117
diff -u -r1.1116 -r1.1117
--- CHANGES 1998/10/22 20:56:55 1.1116
+++ CHANGES 1998/10/23 06:50:37 1.1117
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) PORT: DSO support for UnixWare 7
+ [Ralf S. Engelschall]
+
*) Merge the contents of the {srm,access}.conf-dist* files into the
httpd.conf-dist* files. The srm and access files now contain
only comments, and httpd.conf has all the combined contents in
1.302 +1 -9 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- Configure 1998/10/22 11:54:57 1.301
+++ Configure 1998/10/23 06:50:37 1.302
@@ -1013,15 +1013,7 @@
LDFLAGS_SHLIB=-shared -expect_unresolved '*' -s
LDFLAGS_SHLIB_EXPORT=
;;
-*-unixware2)
-case $CC in
-*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;;
-*/cc|cc ) CFLAGS_SHLIB=-KPIC ;;
-esac
-LDFLAGS_SHLIB=-Bdynamic -G
-LDFLAGS_SHLIB_EXPORT=-Wl,-Bexport
-;;
-*-unixware21*)
+*-unixware*)
case $CC in
*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;;
*/cc|cc ) CFLAGS_SHLIB=-KPIC ;;
cvs commit: apache-1.3/htdocs/manual/misc perf-hp.html
rse 98/10/23 00:43:09 Modified:htdocs/manual/misc perf-hp.html Log: Add hint to HP performance tuning document on authors request. Submitted by: rick jones [EMAIL PROTECTED] PR: 3214 Revision ChangesPath 1.5 +4 -0 apache-1.3/htdocs/manual/misc/perf-hp.html Index: perf-hp.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-hp.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perf-hp.html 1998/02/05 21:19:57 1.4 +++ perf-hp.html 1998/10/23 07:43:09 1.5 @@ -44,6 +44,10 @@ accomplished with adb against the *disc* image of the kernel. The variable name is tcp_hash_size. +Notice that it's critically important that you use W to write a 32 bit +quantity, not w to write a 16 bit value when patching the disc image because +the tcp_hash_size variable is a 32 bit quantity. + P How to pick the value? Examine the output of
cvs commit: apache-1.3/src CHANGES
rse 98/10/23 01:12:06
Modified:src CHANGES
Log:
Ops, I missed Ron Records similar fix in his UnixWare 7 patch.
So give him credit, too.
Revision ChangesPath
1.1118+1 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1117
retrieving revision 1.1118
diff -u -r1.1117 -r1.1118
--- CHANGES 1998/10/23 06:50:37 1.1117
+++ CHANGES 1998/10/23 08:12:03 1.1118
@@ -1,7 +1,7 @@
Changes with Apache 1.3.4
*) PORT: DSO support for UnixWare 7
- [Ralf S. Engelschall]
+ [Ralf S. Engelschall, Ron Record [EMAIL PROTECTED]]
*) Merge the contents of the {srm,access}.conf-dist* files into the
httpd.conf-dist* files. The srm and access files now contain
cvs commit: apache-1.3/src/modules/standard mod_auth_db.c
rse 98/10/23 01:15:01
Modified:src CHANGES
src/modules/standard mod_auth_db.c
Log:
Fix Berkeley-DB/2.x support in mod_auth_db: The data structures were not
initialized correctly and the db_open() call used an invalid mode
parameter.
Because compare especially this section from db_dbt(3):
| In order to ensure compatibility with future releases of DB, all
| fields of the DBT structure that are not explic- itly set should be
| initialized to 0 before the first time the structure is used. Do this
| by declaring the structure external or static, or by calling the C
| library routine bzero(3) or memset(3).
Submitted by: Ron Klatchko [EMAIL PROTECTED]
PR: 3171
Revision ChangesPath
1.1119+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1118
retrieving revision 1.1119
diff -u -r1.1118 -r1.1119
--- CHANGES 1998/10/23 08:12:03 1.1118
+++ CHANGES 1998/10/23 08:14:58 1.1119
@@ -1,5 +1,9 @@
Changes with Apache 1.3.4
+ *) Fix Berkeley-DB/2.x support in mod_auth_db: The data structures were not
+ initialized correctly and the db_open() call used an invalid mode
+ parameter. [Ron Klatchko [EMAIL PROTECTED]] PR#3171
+
*) PORT: DSO support for UnixWare 7
[Ralf S. Engelschall, Ron Record [EMAIL PROTECTED]]
1.35 +4 -1 apache-1.3/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_auth_db.c 1998/10/03 15:11:52 1.34
+++ mod_auth_db.c 1998/10/23 08:15:01 1.35
@@ -155,11 +155,14 @@
DBT d, q;
char *pw = NULL;
+memset(d, 0, sizeof(d));
+memset(q, 0, sizeof(q));
+
q.data = user;
q.size = strlen(q.data);
#ifdef DB2
-if (db_open(auth_dbpwfile, DB_HASH, O_RDONLY, 0664, NULL, NULL, f) !=
0) {
+if (db_open(auth_dbpwfile, DB_HASH, DB_RDONLY, 0664, NULL, NULL, f) !=
0) {
#else
if (!(f = dbopen(auth_dbpwfile, O_RDONLY, 0664, DB_HASH, NULL))) {
#endif
cvs commit: apache-1.3/src/modules/standard mod_imap.c
rse 98/10/23 01:32:30
Modified:src CHANGES
src/modules/standard mod_imap.c
Log:
Fix multiple whitespace handling in imagemaps for mod_imap which was
broken since Apache 1.3.1 where we took out compressing of multiple
spaces in ap_cfg_getline().
Submitted by: Ivan Richwalski [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 3249
Revision ChangesPath
1.1120+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1119
retrieving revision 1.1120
diff -u -r1.1119 -r1.1120
--- CHANGES 1998/10/23 08:14:58 1.1119
+++ CHANGES 1998/10/23 08:32:25 1.1120
@@ -1,5 +1,10 @@
Changes with Apache 1.3.4
+ *) Fix multiple whitespace handling in imagemaps for mod_imap which was
+ broken since Apache 1.3.1 where we took out compressing of multiple
+ spaces in ap_cfg_getline().
+ [Ivan Richwalski [EMAIL PROTECTED]] PR#3249
+
*) Fix Berkeley-DB/2.x support in mod_auth_db: The data structures were not
initialized correctly and the db_open() call used an invalid mode
parameter. [Ron Klatchko [EMAIL PROTECTED]] PR#3171
1.49 +9 -6 apache-1.3/src/modules/standard/mod_imap.c
Index: mod_imap.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_imap.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mod_imap.c1998/08/06 17:30:58 1.48
+++ mod_imap.c1998/10/23 08:32:29 1.49
@@ -679,11 +679,10 @@
if we aren't printing a menu */
/* find the first two space delimited fields, recall that
- * cfg_getline has removed leading/trailing whitespace and
- * compressed the other whitespace down to one space a piece
+ * ap_cfg_getline has removed leading/trailing whitespace.
*
* note that we're tokenizing as we go... if we were to use the
- * getword() class of functions we would end up allocating extra
+ * ap_getword() class of functions we would end up allocating extra
* memory for every line of the map file
*/
string_pos = input;
@@ -692,7 +691,7 @@
}
directive = string_pos;
- while (*string_pos *string_pos != ' ') { /* past directive */
+ while (*string_pos !ap_isspace(*string_pos)) { /* past
directive */
++string_pos;
}
if (!*string_pos) { /* need at least two fields */
@@ -703,11 +702,15 @@
if (!*string_pos) { /* need at least two fields */
goto need_2_fields;
}
+ while(*string_pos ap_isspace(*string_pos)) { /* past whitespace */
+ ++string_pos;
+ }
+
value = string_pos;
- while (*string_pos *string_pos != ' ') { /* past value */
+ while (*string_pos !ap_isspace(*string_pos)) { /* past value */
++string_pos;
}
- if (*string_pos == ' ') {
+ if (ap_isspace(*string_pos)) {
*string_pos++ = '\0';
}
else {
cvs commit: apache-1.3/htdocs/manual/misc howto.html
coar98/10/23 08:14:14 Modified:htdocs/manual/misc howto.html Log: Add a 'howto' item submitted in April of 1998 (ouch!). Submitted by: David Sedlock [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.10 +42 -0 apache-1.3/htdocs/manual/misc/howto.html Index: howto.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/howto.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- howto.html1998/09/17 14:52:02 1.9 +++ howto.html1998/10/23 15:14:14 1.10 @@ -24,6 +24,8 @@ URL/A LIA HREF=#logresetreset your log files/A LIA HREF=#stoprobstop/restrict robots/A +LIA HREF=#proxysslproxy SSL requests EMthrough/EM your non-SSL +server/A /UL HR @@ -161,6 +163,46 @@ to the A HREF=http://info.webcrawler.com/mak/projects/robots/robots.html; robot information pages/A provided by Martijn Koster for the syntax./P +HR +H2A NAME=proxysslHow to proxy SSL requests EMthrough/EM +your non-SSL Apache server/A +BR +SMALL(EMsubmitted by David Sedlock/EM)/SMALL +/H2 +P +SSL uses port 443 for requests for secure pages. If your browser just +sits there for a long time when you attempt to access a secure page +over your Apache proxy, then the proxy may not be configured to handle +SSL. You need to instruct Apache to listen on port 443 in addition to +any of the ports on which it is already listening: +/P +PRE +Listen 80 +Listen 443 +/PRE +P +Then set the security proxy in your browser to 443. That might be it! +/P +P +If your proxy is sending requests to another proxy, then you may have +to set the directive ProxyRemote differently. Here are my settings: +/P +PRE +ProxyRemote http://nicklas:80/ http://proxy.mayn.franken.de:8080 +ProxyRemote http://nicklas:443/ http://proxy.mayn.franken.de:443 +/PRE +P +Requests on port 80 of my proxy SAMPnicklas/SAMP are forwarded to +proxySAMP.mayn.franken.de:8080/SAMP, while requests on port 443 are +forwarded to SAMPproxy.mayn.franken.de:443/SAMP. +If the remote proxy is not set up to +handle port 443, then the last directive can be left out. SSL requests +will only go over the first proxy. +/P +P +Note that your Apache does NOT have to be set up to serve secure pages +with SSL. Proxying SSL is a different thing from using it. +/P !--#include virtual=footer.html -- /BODY /HTML
cvs commit: apache-1.3/htdocs/manual/misc FAQ.html
coar98/10/23 11:46:14 Modified:htdocs/manual/misc FAQ.html Log: Change the FastCGI URL to which the FAQ points; use the site's main page instead of a stale one. Submitted by: Marc Mengel [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.133 +2 -2 apache-1.3/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- FAQ.html 1998/10/19 04:59:36 1.132 +++ FAQ.html 1998/10/23 18:46:12 1.133 @@ -14,7 +14,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.132 $ ($Date: 1998/10/19 04:59:36 $) + $Revision: 1.133 $ ($Date: 1998/10/23 18:46:12 $) /P P The latest version of this FAQ is always available from the main @@ -1235,7 +1235,7 @@ The simple answer is that it was becoming too difficult to keep the version being included with Apache synchronized with the master copy at the - A HREF=http://www.fastcgi.com/servers/apache/; + A HREF=http://www.fastcgi.com/; FastCGI web site/A. When a new version of Apache was released, the version of the FastCGI module included with it would soon be out of date. /P
cvs commit: apache-1.3/src/main http_core.c util.c
coar98/10/23 12:06:29
Modified:src CHANGES
src/main http_core.c util.c
Log:
Fix some more Win32-only problems: treat {.*/}nul on Win32
the way we do /dev/null on Unix, and mention the inapplicability
of the User directive if encountered on Win32.
PR: 2078, 2303
Submitted by: Ken Parzygnat [EMAIL PROTECTED]
Reviewed by: Ken Coar
Revision ChangesPath
1.1121+6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1120
retrieving revision 1.1121
diff -u -r1.1120 -r1.1121
--- CHANGES 1998/10/23 08:32:25 1.1120
+++ CHANGES 1998/10/23 19:06:24 1.1121
@@ -1,5 +1,11 @@
Changes with Apache 1.3.4
+ *) Properly handle allow nul and .*/null in AccessConfig and
+ ResourceConfig directives on Win32. Also add a note to the effect
+ of 'useless User directive ignored on Win32' to the errorlog if
+ a User directive is encountered on Win32.
+ [Ken Parzygnat [EMAIL PROTECTED]] PR#2078, 2303.
+
*) Fix multiple whitespace handling in imagemaps for mod_imap which was
broken since Apache 1.3.1 where we took out compressing of multiple
spaces in ap_cfg_getline().
1.236 +6 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- http_core.c 1998/10/21 05:57:53 1.235
+++ http_core.c 1998/10/23 19:06:26 1.236
@@ -1665,6 +1665,11 @@
static const char *set_user(cmd_parms *cmd, void *dummy, char *arg)
{
+#ifdef WIN32
+ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, cmd-server,
+ User directive has no affect on Win32);
+cmd-server-server_uid = ap_user_id = 1;
+#else
const char *err = ap_check_cmd_context(cmd,
NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
if (err != NULL) {
return err;
@@ -1700,6 +1705,7 @@
exit (1);
}
#endif
+#endif /* WIN32 */
return NULL;
}
1.136 +3 -1 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- util.c1998/10/10 00:40:07 1.135
+++ util.c1998/10/23 19:06:27 1.136
@@ -760,7 +760,9 @@
if (fstat(fileno(file), stbuf) == 0
!S_ISREG(stbuf.st_mode)
#ifdef WIN32
-strcasecmp(name, nul) != 0) {
+!(strcasecmp(name, nul) == 0 ||
+ (strlen(name) = 4
+ strcasecmp(name + strlen(name) - 4, /nul) == 0))) {
#else
strcmp(name, /dev/null) != 0) {
#endif
cvs commit: apache-1.3/src/modules/standard mod_mime.c
coar98/10/23 12:28:54
Modified:.STATUS
src CHANGES
src/modules/standard mod_mime.c
Log:
Allow selective dissociation of handlers from file extensions.
PR: 1799
Submitted by: Ryan Bloom [EMAIL PROTECTED]
Reviewed by: Ken Coar
Revision ChangesPath
1.520 +0 -12 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- STATUS1998/10/21 16:00:42 1.519
+++ STATUS1998/10/23 19:28:50 1.520
@@ -168,18 +168,6 @@
In particular this affects the correctness of the proxy and the
vhost mechanism.
-* PR#1799: we need to add a default or none handler to deal with
- filenames such as foo.map.gif which aren't image maps, and shouldn't
- be considered such. See discussion in
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- (feb98 archives)
- Jim: I thought that we decided default, although Ken
- thought it ugly
- Ken: I just don't like using Add when reverting something; not a -1
-
* proxy_*_canon routines use r-proxyreq incorrectly. See
[EMAIL PROTECTED]
1.1122+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1121
retrieving revision 1.1122
diff -u -r1.1121 -r1.1122
--- CHANGES 1998/10/23 19:06:24 1.1121
+++ CHANGES 1998/10/23 19:28:51 1.1122
@@ -1,5 +1,9 @@
Changes with Apache 1.3.4
+ *) Add a 'RemoveHandler' directive which will selectively remove
+ all handler associations for the specified file extensions.
+ [Ryan Bloom [EMAIL PROTECTED]] PR#1799.
+
*) Properly handle allow nul and .*/null in AccessConfig and
ResourceConfig directives on Win32. Also add a note to the effect
of 'useless User directive ignored on Win32' to the errorlog if
1.45 +34 -1 apache-1.3/src/modules/standard/mod_mime.c
Index: mod_mime.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mod_mime.c1998/07/08 17:47:17 1.44
+++ mod_mime.c1998/10/23 19:28:53 1.45
@@ -68,11 +68,16 @@
#include http_config.h
#include http_log.h
+typedef struct handlers_info {
+char *name;
+} handlers_info;
+
typedef struct {
table *forced_types;/* Additional AddTyped stuff */
table *encoding_types; /* Added with AddEncoding... */
table *language_types; /* Added with AddLanguage... */
table *handlers;/* Added with AddHandler... */
+array_header *handlers_remove; /* List of handlers to remove */
char *type; /* Type forced with ForceType */
char *handler; /* Handler forced with SetHandler */
@@ -89,6 +94,7 @@
new-encoding_types = ap_make_table(p, 4);
new-language_types = ap_make_table(p, 4);
new-handlers = ap_make_table(p, 4);
+new-handlers_remove = ap_make_array(p, 4, sizeof(handlers_info));
new-type = NULL;
new-handler = NULL;
@@ -101,7 +107,14 @@
mime_dir_config *base = (mime_dir_config *) basev;
mime_dir_config *add = (mime_dir_config *) addv;
mime_dir_config *new =
-(mime_dir_config *) ap_palloc(p, sizeof(mime_dir_config));
+ (mime_dir_config *) ap_palloc(p, sizeof(mime_dir_config));
+int i;
+handlers_info *hand;
+
+hand = (handlers_info *) add-handlers_remove-elts;
+for (i = 0; i add-handlers_remove-nelts; i++) {
+ ap_table_unset(base-handlers, hand[i].name);
+}
new-forced_types = ap_overlay_tables(p, add-forced_types,
base-forced_types);
@@ -158,6 +171,24 @@
return NULL;
}
+/*
+ * Note handler names that should be un-added for this location. This
+ * will keep the association from being inherited, as well, but not
+ * from being re-added at a subordinate level.
+ */
+static const char *remove_handler(cmd_parms *cmd, void *m, char *ext)
+{
+mime_dir_config *mcfg = (mime_dir_config *) m;
+handlers_info *hand;
+
+if (*ext == '.') {
+ ++ext;
+}
+hand = (handlers_info *) ap_push_array(mcfg-handlers_remove);
+hand-name = ap_pstrdup(cmd-pool, ext);
+return NULL;
+}
+
/* The sole bit of server configuration that the MIME module has is
* the name of its config file,
cvs commit: apache-1.3/src/main http_core.c
coar98/10/23 13:07:40
Modified:src CHANGES
src/main http_core.c
Log:
Fix problem with config parser not noticing if a container
start line was missing the closing ''.
PR: 3279
Submitted by: Ryan Bloom [EMAIL PROTECTED]
Reviewed by: Ken Coar
Revision ChangesPath
1.1123+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1122
retrieving revision 1.1123
diff -u -r1.1122 -r1.1123
--- CHANGES 1998/10/23 19:28:51 1.1122
+++ CHANGES 1998/10/23 20:07:37 1.1123
@@ -1,5 +1,10 @@
Changes with Apache 1.3.4
+ *) The config parser wasn't correctly noticing a missing ''
+ on container start lines (e.g., it wouldn't spot
+ Directory / as a syntax error). [Ryan Bloom [EMAIL PROTECTED]]
+ PR#3279
+
*) Add a 'RemoveHandler' directive which will selectively remove
all handler associations for the specified file extensions.
[Ryan Bloom [EMAIL PROTECTED]] PR#1799.
1.237 +35 -12apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- http_core.c 1998/10/23 19:06:26 1.236
+++ http_core.c 1998/10/23 20:07:39 1.237
@@ -1149,6 +1149,15 @@
return cmd-end_token;
}
+/*
+ * Report a missing-'' syntax error.
+ */
+static char *unclosed_directive(cmd_parms *cmd)
+{
+return ap_pstrcat(cmd-pool, cmd-cmd-name,
+directive missing closing '', NULL);
+}
+
static const char *dirsection(cmd_parms *cmd, void *dummy, const char *arg)
{
const char *errmsg;
@@ -1167,10 +1176,12 @@
return err;
}
-if (endp) {
-*endp = '\0';
+if (endp == NULL) {
+ return unclosed_directive(cmd);
}
+*endp = '\0';
+
cmd-path = ap_getword_conf(cmd-pool, arg);
#ifdef OS2
/* Fix OS/2 HPFS filename case problem. */
@@ -1238,10 +1249,12 @@
return err;
}
-if (endp) {
-*endp = '\0';
+if (endp == NULL) {
+ return unclosed_directive(cmd);
}
+*endp = '\0';
+
cmd-path = ap_getword_conf(cmd-pool, arg);
cmd-override = OR_ALL|ACCESS_CONF;
@@ -1304,10 +1317,12 @@
return err;
}
-if (endp) {
-*endp = '\0';
+if (endp == NULL) {
+ return unclosed_directive(cmd);
}
+*endp = '\0';
+
cmd-path = ap_getword_conf(cmd-pool, arg);
/* Only if not an .htaccess file */
if (!old_path) {
@@ -1376,9 +1391,12 @@
module *found;
int nest = 1;
-if (endp) {
-*endp = '\0';
+if (endp == NULL) {
+ return unclosed_directive(cmd);
}
+
+*endp = '\0';
+
if (not) {
arg++;
}
@@ -1433,9 +1451,12 @@
int nest = 1;
endp = strrchr(arg, '');
-if (endp) {
- *endp = '\0';
+if (endp == NULL) {
+ return unclosed_directive(cmd);
}
+
+*endp = '\0';
+
if (arg[0] == '!') {
not = 1;
arg++;
@@ -1477,9 +1498,11 @@
return err;
}
-if (endp) {
-*endp = '\0';
+if (endp == NULL) {
+ return unclosed_directive(cmd);
}
+
+*endp = '\0';
/* FIXME: There's another feature waiting to happen here -- since you
can now put multiple addresses/names on a single VirtualHost
