From 17072601bd6eae365b5c3edc7ad2022e813378b9 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sun, 1 May 2016 06:36:33 +0000 Subject: [PATCH] Remove useless
in highlight blocks. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1741841 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/custom-error.xml | 16 +++---- docs/manual/developer/hooks.xml | 10 ++--- docs/manual/developer/output-filters.xml | 53 ++++++++++++------------ docs/manual/howto/htaccess.xml | 2 +- docs/manual/howto/public_html.xml | 4 +- docs/manual/howto/ssi.xml | 8 ++-- docs/manual/logs.xml | 6 +-- docs/manual/mod/mod_include.xml | 14 +++---- docs/manual/mod/mod_lua.xml | 20 ++++----- docs/manual/mod/mod_rewrite.xml | 8 ++-- 10 files changed, 70 insertions(+), 71 deletions(-) diff --git a/docs/manual/custom-error.xml b/docs/manual/custom-error.xml index 1698b89768..0f3c41ba3e 100644 --- a/docs/manual/custom-error.xml +++ b/docs/manual/custom-error.xml @@ -56,10 +56,10 @@ FileInfo.

-ErrorDocument 500 "Sorry, our script crashed. Oh dear"
-ErrorDocument 500 /cgi-bin/crash-recover
-ErrorDocument 500 http://error.example.com/server_error.html
-ErrorDocument 404 /errors/not_found.html
+ErrorDocument 500 "Sorry, our script crashed. Oh dear" +ErrorDocument 500 /cgi-bin/crash-recover +ErrorDocument 500 http://error.example.com/server_error.html +ErrorDocument 404 /errors/not_found.html ErrorDocument 401 /subscription/how_to_subscribe.html @@ -147,8 +147,8 @@ ErrorDocument 401 /subscription/how_to_subscribe.html ... -print "Content-type: text/html\n";
-printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"};
+print "Content-type: text/html\n"; +printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; ... @@ -175,8 +175,8 @@ printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"};

In your server configuration file, you'll see a line such as:

- # Multi-language error messages
- #Include conf/extra/httpd-multilang-errordoc.conf +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf

Uncommenting this Include line will enable this diff --git a/docs/manual/developer/hooks.xml b/docs/manual/developer/hooks.xml index 0c01da572d..37ea0608d6 100644 --- a/docs/manual/developer/hooks.xml +++ b/docs/manual/developer/hooks.xml @@ -65,7 +65,7 @@ takes a request_rec * and an int and is called do_something, then declare it like this:

- AP_DECLARE_HOOK(int, do_something, (request_rec *r, int n)) +AP_DECLARE_HOOK(int, do_something, (request_rec *r, int n))

This should go in a header which modules will include if @@ -96,7 +96,7 @@ APR_HOOK_STRUCT( hooks are called, and the caller is implemented like this:

- AP_IMPLEMENT_HOOK_VOID(do_something, (request_rec *r, int n), (r, n)) +AP_IMPLEMENT_HOOK_VOID(do_something, (request_rec *r, int n), (r, n))

The second and third arguments are the dummy argument @@ -118,7 +118,7 @@ void ap_run_do_something(request_rec *r, int n) the first hook that does something interesting, like so:

- AP_IMPLEMENT_HOOK_RUN_FIRST(int, do_something, (request_rec *r, int n), (r, n), DECLINED) +AP_IMPLEMENT_HOOK_RUN_FIRST(int, do_something, (request_rec *r, int n), (r, n), DECLINED)

The first hook that does not return DECLINED @@ -135,7 +135,7 @@ void ap_run_do_something(request_rec *r, int n) return is the return value. Declare these like so:

- AP_IMPLEMENT_HOOK_RUN_ALL(int, do_something, (request_rec *r, int n), (r, n), OK, DECLINED) +AP_IMPLEMENT_HOOK_RUN_ALL(int, do_something, (request_rec *r, int n), (r, n), OK, DECLINED)

Again, OK and DECLINED are the traditional @@ -165,7 +165,7 @@ ret=ap_run_do_something(r, n); of the correct type:

-static int my_something_doer(request_rec *r, int n)
+static int my_something_doer(request_rec *r, int n) { ... return OK; diff --git a/docs/manual/developer/output-filters.xml b/docs/manual/developer/output-filters.xml index 25658e7d69..7aa43beea7 100644 --- a/docs/manual/developer/output-filters.xml +++ b/docs/manual/developer/output-filters.xml @@ -122,12 +122,12 @@ How to handle an empty brigade - apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)
- { - if (APR_BRIGADE_EMPTY(bb)) { - return APR_SUCCESS; - } - .... +apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb) +{ + if (APR_BRIGADE_EMPTY(bb)) { + return APR_SUCCESS; + } + ... @@ -281,16 +281,16 @@ const char *data; apr_size_t length; while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) { - rv = apr_bucket_read(e, &data, &length, APR_BLOCK_READ); - if (rv) ...; - /* Remove bucket e from bb. */ - APR_BUCKET_REMOVE(e); - /* Insert it into temporary brigade. */ - APR_BRIGADE_INSERT_HEAD(tmpbb, e); - /* Pass brigade downstream. */ - rv = ap_pass_brigade(f->next, tmpbb); - if (rv) ...; - apr_brigade_cleanup(tmpbb); + rv = apr_bucket_read(e, &data, &length, APR_BLOCK_READ); + if (rv) ...; + /* Remove bucket e from bb. */ + APR_BUCKET_REMOVE(e); + /* Insert it into temporary brigade. */ + APR_BRIGADE_INSERT_HEAD(tmpbb, e); + /* Pass brigade downstream. */ + rv = ap_pass_brigade(f->next, tmpbb); + if (rv) ...; + apr_brigade_cleanup(tmpbb); } @@ -311,26 +311,24 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) { Example code to maintain filter state struct dummy_state { - apr_bucket_brigade *tmpbb; - int filter_state; - ... + apr_bucket_brigade *tmpbb; + int filter_state; + ... }; apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb) { - struct dummy_state *state; state = f->ctx; if (state == NULL) { - /* First invocation for this response: initialise state structure. - */ - f->ctx = state = apr_palloc(f->r->pool, sizeof *state); - - state->tmpbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc); - state->filter_state = ...; + /* First invocation for this response: initialise state structure. + */ + f->ctx = state = apr_palloc(f->r->pool, sizeof *state); + state->tmpbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc); + state->filter_state = ...; } ... @@ -430,7 +428,8 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) { /* Retry, using a blocking read. */ mode = APR_BLOCK_READ; continue; - } else if (rv != APR_SUCCESS) { + } + else if (rv != APR_SUCCESS) { /* handle errors */ } diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml index 988fe25b4a..5cb632141e 100644 --- a/docs/manual/howto/htaccess.xml +++ b/docs/manual/howto/htaccess.xml @@ -307,7 +307,7 @@ Options Includes </Directory> <Location "/"> - Options +IncludesNoExec -ExecCGI
+ Options +IncludesNoExec -ExecCGI </Location> diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml index 063501378b..cbec42cd0f 100644 --- a/docs/manual/howto/public_html.xml +++ b/docs/manual/howto/public_html.xml @@ -136,8 +136,8 @@ using a configuration like the following:

- UserDir disabled
- UserDir enabled rbowen krietz +UserDir disabled +UserDir enabled rbowen krietz

See UserDir diff --git a/docs/manual/howto/ssi.xml b/docs/manual/howto/ssi.xml index 776b7df9cf..dc9b40a181 100644 --- a/docs/manual/howto/ssi.xml +++ b/docs/manual/howto/ssi.xml @@ -95,7 +95,7 @@ existing HTML documents.

directive either in your httpd.conf file, or in a .htaccess file:

- Options +Includes +Options +Includes

This tells Apache that you want to permit files to be parsed @@ -111,8 +111,8 @@ existing HTML documents.

particular file extension, such as .shtml, with the following directives:

- AddType text/html .shtml
- AddOutputFilter INCLUDES .shtml +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml

One disadvantage to this approach is that if you wanted to @@ -124,7 +124,7 @@ existing HTML documents.

The other method is to use the XBitHack directive:

- XBitHack on +XBitHack on

XBitHack diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml index 1757ec75f1..a6a91985f8 100644 --- a/docs/manual/logs.xml +++ b/docs/manual/logs.xml @@ -476,9 +476,9 @@ CustomLog logs/access_log common env=!dontlog different log file.

- SetEnvIf Accept-Language "en" english
- CustomLog logs/english_log common env=english
- CustomLog logs/non_english_log common env=!english +SetEnvIf Accept-Language "en" english +CustomLog logs/english_log common env=english +CustomLog logs/non_english_log common env=!english

In a caching scenario one would want to know about diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml index 04b57fcd10..40cf8f671e 100644 --- a/docs/manual/mod/mod_include.xml +++ b/docs/manual/mod/mod_include.xml @@ -64,7 +64,7 @@ AddOutputFilter INCLUDES .shtml is set):

- Options +Includes +Options +Includes

For backwards compatibility, the server-parsed @@ -823,7 +823,7 @@ AddOutputFilter INCLUDES .shtml looks for to mark the end of an include element.

- SSIEndTag "%>" +SSIEndTag "%>" @@ -844,7 +844,7 @@ AddOutputFilter INCLUDES .shtml displays when a variable is not set and "echoed".

- SSIUndefinedEcho "<!-- undef -->" +SSIUndefinedEcho "<!-- undef -->" @@ -871,7 +871,7 @@ directive]" errmsg=message --> element.

- SSIErrorMsg "<!-- Error -->" +SSIErrorMsg "<!-- Error -->" @@ -893,8 +893,8 @@ directive]" different times).

- SSIStartTag "<%"
- SSIEndTag "%>" +SSIStartTag "<%" +SSIEndTag "%>"

The example given above, which also specifies a matching @@ -930,7 +930,7 @@ displayed timefmt=formatstring --> element.

- SSITimeFormat "%R, %B %d, %Y" +SSITimeFormat "%R, %B %d, %Y"

The above directive would cause times to be displayed in the diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml index 2dab4b7e30..077fddc3ff 100644 --- a/docs/manual/mod/mod_lua.xml +++ b/docs/manual/mod/mod_lua.xml @@ -1032,16 +1032,16 @@ end

Logging Functions - -- examples of logging messages
- r:trace1("This is a trace log message") -- trace1 through trace8 can be used
- r:debug("This is a debug log message")
- r:info("This is an info log message")
- r:notice("This is a notice log message")
- r:warn("This is a warn log message")
- r:err("This is an err log message")
- r:alert("This is an alert log message")
- r:crit("This is a crit log message")
- r:emerg("This is an emerg log message")
+-- examples of logging messages +r:trace1("This is a trace log message") -- trace1 through trace8 can be used +r:debug("This is a debug log message") +r:info("This is an info log message") +r:notice("This is a notice log message") +r:warn("This is a warn log message") +r:err("This is an err log message") +r:alert("This is an alert log message") +r:crit("This is a crit log message") +r:emerg("This is an emerg log message")
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index 3c73246f9a..187472c9ba 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -70,8 +70,8 @@ URLs on the fly Example - LogLevel alert rewrite:trace3 - +LogLevel alert rewrite:trace3 + RewriteLog @@ -941,7 +941,7 @@ RewriteRule ^(.+) /other/archive/$1 [R] -
  • +

  • If the TestString has the special value expr, the CondPattern will be treated as an ap_expr.

    @@ -953,7 +953,7 @@ RewriteRule ^(.+) /other/archive/$1 [R]

    -RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"
    +RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'" RewriteRule "^/images" "-" [F]
    • -- 2.40.0