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

(-)file_not_specified_in_diff (-32 / +32 lines)
Line  Link Here
0
-- a/LICENSE
0
++ b/LICENSE
Lines 516-522 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, 
523
-- a/docs/man/httxt2dbm.1
523
++ b/docs/man/httxt2dbm.1
Lines 50-56 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\&.  
57
-- a/docs/manual/howto/htaccess.html.ja.utf8
57
++ b/docs/manual/howto/htaccess.html.ja.utf8
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 Link Here
414
    prettyPrint();
414
    prettyPrint();
415
}
415
}
416
//--><!]]></script>
416
//--><!]]></script>
417
</body></html>
417
</body></html>
418
-- a/docs/manual/mod/core.html.es
418
++ b/docs/manual/mod/core.html.es
Lines 1211-1217 Link Here
1211
    error rather than masking it.  More information is available in
1211
    error rather than masking it.  More information is available in
1212
    Microsoft Knowledge Base article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>
1212
    Microsoft Knowledge Base article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>
1213
1213
1214
    <p>Although most error messages can be overriden, there are certain
1214
    <p>Although most error messages can be overridden, there are certain
1215
    circumstances where the internal messages are used regardless of the
1215
    circumstances where the internal messages are used regardless of the
1216
    setting of <code class="directive"><a href="#errordocument">ErrorDocument</a></code>.  In
1216
    setting of <code class="directive"><a href="#errordocument">ErrorDocument</a></code>.  In
1217
    particular, if a malformed request is detected, normal request processing
1217
    particular, if a malformed request is detected, normal request processing
Lines 4524-4527 Link Here
4524
    prettyPrint();
4524
    prettyPrint();
4525
}
4525
}
4526
//--><!]]></script>
4526
//--><!]]></script>
4527
</body></html>
4527
</body></html>
4528
-- a/docs/manual/programs/httxt2dbm.html.en
4528
++ b/docs/manual/programs/httxt2dbm.html.en
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 Link Here
111
    prettyPrint();
111
    prettyPrint();
112
}
112
}
113
//--><!]]></script>
113
//--><!]]></script>
114
</body></html>
114
</body></html>
115
-- a/modules/http/http_request.c
115
++ b/modules/http/http_request.c
Lines 376-382 Link Here
376
    
376
    
377
    /* The EOR bucket has either been handled by an output filter (eg.
377
    /* The EOR bucket has either been handled by an output filter (eg.
378
     * deleted or moved to a buffered_bb => no more in bb), or an error
378
     * deleted or moved to a buffered_bb => no more in bb), or an error
379
     * occured before that (eg. c->aborted => still in bb) and we ought
379
     * occurred before that (eg. c->aborted => still in bb) and we ought
380
     * to destroy it now. So cleanup any remaining bucket along with
380
     * to destroy it now. So cleanup any remaining bucket along with
381
     * the orphan request (if any).
381
     * the orphan request (if any).
382
     */
382
     */
Lines 779-785 Link Here
779
779
780
    AP_INTERNAL_REDIRECT(r->uri, new_uri);
780
    AP_INTERNAL_REDIRECT(r->uri, new_uri);
781
781
782
    /* ap_die was already called, if an error occured */
782
    /* ap_die was already called, if an error occurred */
783
    if (!new) {
783
    if (!new) {
784
        return;
784
        return;
785
    }
785
    }
Lines 803-809 Link Here
803
    int access_status;
803
    int access_status;
804
    request_rec *new = internal_internal_redirect(new_uri, r);
804
    request_rec *new = internal_internal_redirect(new_uri, r);
805
805
806
    /* ap_die was already called, if an error occured */
806
    /* ap_die was already called, if an error occurred */
807
    if (!new) {
807
    if (!new) {
808
        return;
808
        return;
809
    }
809
    }
810
-- a/modules/http2/h2_config.c
810
++ b/modules/http2/h2_config.c
Lines 419-425 Link Here
419
    else if (!strcasecmp("BEFORE", sdependency)) {
419
    else if (!strcasecmp("BEFORE", sdependency)) {
420
        dependency = H2_DEPENDANT_BEFORE;
420
        dependency = H2_DEPENDANT_BEFORE;
421
        if (sweight) {
421
        if (sweight) {
422
            return "dependecy 'Before' does not allow a weight";
422
            return "dependency 'Before' does not allow a weight";
423
        }
423
        }
424
    } 
424
    } 
425
    else if (!strcasecmp("INTERLEAVED", sdependency)) {
425
    else if (!strcasecmp("INTERLEAVED", sdependency)) {
426
-- a/modules/http2/h2_ngn_shed.c
426
++ b/modules/http2/h2_ngn_shed.c
Lines 281-287 Link Here
281
    if (H2_REQ_ENTRIES_EMPTY(&ngn->entries)) {
281
    if (H2_REQ_ENTRIES_EMPTY(&ngn->entries)) {
282
        if (want_shutdown) {
282
        if (want_shutdown) {
283
            ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, shed->c,
283
            ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, shed->c,
284
                          "h2_ngn_shed(%ld): emtpy queue, shutdown engine %s", 
284
                          "h2_ngn_shed(%ld): empty queue, shutdown engine %s", 
285
                          shed->c->id, ngn->id);
285
                          shed->c->id, ngn->id);
286
            ngn->shutdown = 1;
286
            ngn->shutdown = 1;
287
        }
287
        }
288
-- a/modules/mappers/mod_imagemap.c
288
++ b/modules/mappers/mod_imagemap.c
Lines 858-864 Link Here
858
        /* There's not much else we can do ... we've already sent the headers
858
        /* There's not much else we can do ... we've already sent the headers
859
         * to the client.
859
         * to the client.
860
         */
860
         */
861
        ap_rputs("\n\n[an internal server error occured]\n", r);
861
        ap_rputs("\n\n[an internal server error occurred]\n", r);
862
        menu_footer(r);
862
        menu_footer(r);
863
        return OK;
863
        return OK;
864
    }
864
    }
865
-- a/modules/md/md_acme_authz.c
865
++ b/modules/md/md_acme_authz.c
Lines 239-245 Link Here
239
    
239
    
240
    if (md_log_is_level(p, log_level)) {
240
    if (md_log_is_level(p, log_level)) {
241
        md_log_perror(MD_LOG_MARK, log_level, rv, p, "ACME server authz: %s for %s at %s. "
241
        md_log_perror(MD_LOG_MARK, log_level, rv, p, "ACME server authz: %s for %s at %s. "
242
                      "Exact repsonse was: %s", err? err : "", authz->domain, authz->location,
242
                      "Exact response was: %s", err? err : "", authz->domain, authz->location,
243
                      json? md_json_writep(json, p, MD_JSON_FMT_COMPACT) : "not available");
243
                      json? md_json_writep(json, p, MD_JSON_FMT_COMPACT) : "not available");
244
    }
244
    }
245
    
245
    
246
-- a/modules/metadata/mod_remoteip.c
246
++ b/modules/metadata/mod_remoteip.c
Lines 393-399 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,
400
-- a/modules/ssl/mod_ssl.c
400
++ b/modules/ssl/mod_ssl.c
Lines 94-100 Link Here
94
                "Enable FIPS-140 mode "
94
                "Enable FIPS-140 mode "
95
                "(`on', `off')")
95
                "(`on', `off')")
96
    SSL_CMD_ALL(CipherSuite, TAKE12,
96
    SSL_CMD_ALL(CipherSuite, TAKE12,
97
                "Colon-delimited list of permitted SSL Ciphers, optional preceeded "
97
                "Colon-delimited list of permitted SSL Ciphers, optional preceded "
98
                "by protocol identifier ('XXX:...:XXX' - see manual)")
98
                "by protocol identifier ('XXX:...:XXX' - see manual)")
99
    SSL_CMD_SRV(CertificateFile, TAKE1,
99
    SSL_CMD_SRV(CertificateFile, TAKE1,
100
                "SSL Server Certificate file "
100
                "SSL Server Certificate file "
Lines 187-193 Link Here
187
                "('[+-][" SSL_PROTOCOLS "] ...' - see manual)")
187
                "('[+-][" SSL_PROTOCOLS "] ...' - see manual)")
188
    SSL_CMD_PXY(ProxyCipherSuite, TAKE12,
188
    SSL_CMD_PXY(ProxyCipherSuite, TAKE12,
189
               "SSL Proxy: colon-delimited list of permitted SSL ciphers "
189
               "SSL Proxy: colon-delimited list of permitted SSL ciphers "
190
               ", optionally preceeded by protocol specifier ('XXX:...:XXX' - see manual)")
190
               ", optionally preceded by protocol specifier ('XXX:...:XXX' - see manual)")
191
    SSL_CMD_PXY(ProxyVerify, TAKE1,
191
    SSL_CMD_PXY(ProxyVerify, TAKE1,
192
               "SSL Proxy: whether to verify the remote certificate "
192
               "SSL Proxy: whether to verify the remote certificate "
193
               "('on' or 'off')")
193
               "('on' or 'off')")
194
-- a/support/ab.c
194
++ b/support/ab.c
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