View | Details | Raw Unified | Return to bug 62960
Collapse All | Expand All

(-)a/LICENSE (-1 / +1 lines)
Lines 516-522 This program is Copyright (C) Zeus Technology Limited 1996. Link Here
516
This program may be used and copied freely providing this copyright notice
516
This program may be used and copied freely providing this copyright notice
517
is not removed.
517
is not removed.
518
518
519
This software is provided "as is" and any express or implied waranties, 
519
This software is provided "as is" and any express or implied warranties,
520
including but not limited to, the implied warranties of merchantability and
520
including but not limited to, the implied warranties of merchantability and
521
fitness for a particular purpose are disclaimed.  In no event shall 
521
fitness for a particular purpose are disclaimed.  In no event shall 
522
Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, 
522
Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, 
(-)a/docs/man/httxt2dbm.1 (-1 / +1 lines)
Lines 50-56 More verbose output Link Here
50
Specify the DBM type to be used for the output\&. If not specified, will use the APR Default\&. Available types are: \fBGDBM\fR for GDBM files, \fBSDBM\fR for SDBM files, \fBDB\fR for berkeley DB files, \fBNDBM\fR for NDBM files, \fBdefault\fR for the default DBM type\&.  
50
Specify the DBM type to be used for the output\&. If not specified, will use the APR Default\&. Available types are: \fBGDBM\fR for GDBM files, \fBSDBM\fR for SDBM files, \fBDB\fR for berkeley DB files, \fBNDBM\fR for NDBM files, \fBdefault\fR for the default DBM type\&.  
51
.TP
51
.TP
52
\fB-i \fISOURCE_TXT\fR\fR
52
\fB-i \fISOURCE_TXT\fR\fR
53
Input file from which the dbm is to be created\&. The file should be formated with one record per line, of the form: \fBkey value\fR\&. See the documentation for RewriteMap for further details of this file's format and meaning\&.  
53
Input file from which the dbm is to be created\&. The file should be formatted with one record per line, of the form: \fBkey value\fR\&. See the documentation for RewriteMap for further details of this file's format and meaning\&.
54
.TP
54
.TP
55
\fB-o \fIOUTPUT_DBM\fR\fR
55
\fB-o \fIOUTPUT_DBM\fR\fR
56
Name of the output dbm files\&.  
56
Name of the output dbm files\&.  
(-)a/docs/manual/howto/htaccess.html.ja.utf8 (-2 / +2 lines)
Lines 247-253 Link Here
247
247
248
    <p>As discussed in the documentation on <a href="../sections.html">Configuration Sections</a>,
248
    <p>As discussed in the documentation on <a href="../sections.html">Configuration Sections</a>,
249
    <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections for
249
    <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections for
250
    the corresponding directory, but will be overriden by other types
250
    the corresponding directory, but will be overridden by other types
251
    of configuration sections from the main configuration files.  This
251
    of configuration sections from the main configuration files.  This
252
    fact can be used to enforce certain configurations, even in the
252
    fact can be used to enforce certain configurations, even in the
253
    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> setting.  For example, to
253
    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> setting.  For example, to
Lines 414-417 if (typeof(prettyPrint) !== 'undefined') { Link Here
414
    prettyPrint();
414
    prettyPrint();
415
}
415
}
416
//--><!]]></script>
416
//--><!]]></script>
417
</body></html>
417
</body></html>
(-)a/docs/manual/mod/core.html.es.utf8 (-2 / +2 lines)
Lines 1242-1248 in case of an error</td></tr> Link Here
1242
    error rather than masking it.  More information is available in
1242
    error rather than masking it.  More information is available in
1243
    Microsoft Knowledge Base article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>
1243
    Microsoft Knowledge Base article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>
1244
1244
1245
    <p>Although most error messages can be overriden, there are certain
1245
    <p>Although most error messages can be overridden, there are certain
1246
    circumstances where the internal messages are used regardless of the
1246
    circumstances where the internal messages are used regardless of the
1247
    setting of <code class="directive"><a href="#errordocument">ErrorDocument</a></code>.  In
1247
    setting of <code class="directive"><a href="#errordocument">ErrorDocument</a></code>.  In
1248
    particular, if a malformed request is detected, normal request processing
1248
    particular, if a malformed request is detected, normal request processing
Lines 4616-4619 if (typeof(prettyPrint) !== 'undefined') { Link Here
4616
    prettyPrint();
4616
    prettyPrint();
4617
}
4617
}
4618
//--><!]]></script>
4618
//--><!]]></script>
4619
</body></html>
4619
</body></html>
(-)a/docs/manual/programs/httxt2dbm.html.en (-2 / +2 lines)
Lines 66-72 Link Here
66
    </dd>
66
    </dd>
67
67
68
    <dt><code>-i <var>SOURCE_TXT</var></code></dt>
68
    <dt><code>-i <var>SOURCE_TXT</var></code></dt>
69
    <dd>Input file from which the dbm is to be created. The file should be formated
69
    <dd>Input file from which the dbm is to be created. The file should be formatted
70
    with one record per line, of the form: <code>key value</code>.
70
    with one record per line, of the form: <code>key value</code>.
71
    See the documentation for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> for
71
    See the documentation for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> for
72
    further details of this file's format and meaning.
72
    further details of this file's format and meaning.
Lines 111-114 if (typeof(prettyPrint) !== 'undefined') { Link Here
111
    prettyPrint();
111
    prettyPrint();
112
}
112
}
113
//--><!]]></script>
113
//--><!]]></script>
114
</body></html>
114
</body></html>
(-)a/modules/metadata/mod_remoteip.c (-1 / +1 lines)
Lines 393-399 static void remoteip_warn_enable_conflict(remoteip_addr_info *prev, server_rec * Link Here
393
393
394
    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, new, APLOGNO(03491)
394
    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, new, APLOGNO(03491)
395
                 "RemoteIPProxyProtocol: previous setting for %s:%hu from virtual "
395
                 "RemoteIPProxyProtocol: previous setting for %s:%hu from virtual "
396
                 "host {%s:%hu in %s} is being overriden by virtual host "
396
                 "host {%s:%hu in %s} is being overridden by virtual host "
397
                 "{%s:%hu in %s}; new setting is '%s'",
397
                 "{%s:%hu in %s}; new setting is '%s'",
398
                 buf, prev->addr->port, prev->source->server_hostname,
398
                 buf, prev->addr->port, prev->source->server_hostname,
399
                 prev->source->addrs->host_port, prev->source->defn_name,
399
                 prev->source->addrs->host_port, prev->source->defn_name,
(-)a/modules/ssl/mod_ssl.c (-2 / +2 lines)
Lines 99-105 static const command_rec ssl_config_cmds[] = { Link Here
99
                "Enable FIPS-140 mode "
99
                "Enable FIPS-140 mode "
100
                "(`on', `off')")
100
                "(`on', `off')")
101
    SSL_CMD_ALL(CipherSuite, TAKE12,
101
    SSL_CMD_ALL(CipherSuite, TAKE12,
102
                "Colon-delimited list of permitted SSL Ciphers, optional preceeded "
102
                "Colon-delimited list of permitted SSL Ciphers, optional preceded "
103
                "by protocol identifier ('XXX:...:XXX' - see manual)")
103
                "by protocol identifier ('XXX:...:XXX' - see manual)")
104
    SSL_CMD_SRV(CertificateFile, TAKE1,
104
    SSL_CMD_SRV(CertificateFile, TAKE1,
105
                "SSL Server Certificate file "
105
                "SSL Server Certificate file "
Lines 192-198 static const command_rec ssl_config_cmds[] = { Link Here
192
                "('[+-][" SSL_PROTOCOLS "] ...' - see manual)")
192
                "('[+-][" SSL_PROTOCOLS "] ...' - see manual)")
193
    SSL_CMD_PXY(ProxyCipherSuite, TAKE12,
193
    SSL_CMD_PXY(ProxyCipherSuite, TAKE12,
194
               "SSL Proxy: colon-delimited list of permitted SSL ciphers "
194
               "SSL Proxy: colon-delimited list of permitted SSL ciphers "
195
               ", optionally preceeded by protocol specifier ('XXX:...:XXX' - see manual)")
195
               ", optionally preceded by protocol specifier ('XXX:...:XXX' - see manual)")
196
    SSL_CMD_PXY(ProxyVerify, TAKE1,
196
    SSL_CMD_PXY(ProxyVerify, TAKE1,
197
               "SSL Proxy: whether to verify the remote certificate "
197
               "SSL Proxy: whether to verify the remote certificate "
198
               "('on' or 'off')")
198
               "('on' or 'off')")
(-)a/support/ab.c (-1 / +1 lines)
Lines 18-24 Link Here
18
   ** This program is based on ZeusBench V1.0 written by Adam Twiss
18
   ** This program is based on ZeusBench V1.0 written by Adam Twiss
19
   ** which is Copyright (c) 1996 by Zeus Technology Ltd. http://www.zeustech.net/
19
   ** which is Copyright (c) 1996 by Zeus Technology Ltd. http://www.zeustech.net/
20
   **
20
   **
21
   ** This software is provided "as is" and any express or implied waranties,
21
   ** This software is provided "as is" and any express or implied warranties,
22
   ** including but not limited to, the implied warranties of merchantability and
22
   ** including but not limited to, the implied warranties of merchantability and
23
   ** fitness for a particular purpose are disclaimed.  In no event shall
23
   ** fitness for a particular purpose are disclaimed.  In no event shall
24
   ** Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,
24
   ** Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,

Return to bug 62960