Commit Graph

30120 Commits

Author SHA1 Message Date
eae84a5a63 Add some more modules that use mod_watchdog
r1839250 in trunk

+ remove some trailing spaces to synch with trunk
+ add the optional [s] in WatchdogInterval syntax

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1839254 13f79535-47bb-0310-9956-ffa450edef68
2018-08-26 21:17:20 +00:00
6e8c2406cc Add missing space
(r1839245 on trunk)

+ remove some trailling spaces to synch with trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1839246 13f79535-47bb-0310-9956-ffa450edef68
2018-08-26 20:29:47 +00:00
d894728437 Use the default location to display a default value
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838953 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 20:22:44 +00:00
a0c8e15b0f Fix an example (/foo vs /foo/bar)
Synch with trunk and improve alignment in examples.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838946 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 19:49:59 +00:00
51802df1ef comment change... no functional
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838944 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 19:48:29 +00:00
c42106628f promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838849 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 13:06:50 +00:00
1951f6979c votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838848 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 13:06:30 +00:00
7579aa58bb voted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838846 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 13:06:11 +00:00
c52ae4d23d vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838838 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 12:36:37 +00:00
343fd62d17 Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838688 13f79535-47bb-0310-9956-ffa450edef68
2018-08-22 22:56:33 +00:00
29ee57b424 add to status while I test
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838676 13f79535-47bb-0310-9956-ffa450edef68
2018-08-22 19:15:24 +00:00
522607aa66 forgot to add vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838673 13f79535-47bb-0310-9956-ffa450edef68
2018-08-22 18:49:42 +00:00
96c3afd736 Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838667 13f79535-47bb-0310-9956-ffa450edef68
2018-08-22 17:22:27 +00:00
b5769037d7 propose fix for 2.4.34 regression
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838490 13f79535-47bb-0310-9956-ffa450edef68
2018-08-20 20:52:27 +00:00
c7e37ca576 Backport r1786113 (Wording/formatting/typo fixes.)
+ s/require/Require/ to help syntax color highlight work correctly. (r1838458 + r1838459 in trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838466 13f79535-47bb-0310-9956-ffa450edef68
2018-08-20 19:48:59 +00:00
b77ca7fcbf Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838342 13f79535-47bb-0310-9956-ffa450edef68
2018-08-18 15:50:50 +00:00
292400fda8 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838341 13f79535-47bb-0310-9956-ffa450edef68
2018-08-18 15:49:58 +00:00
733c6c691f - Add some links.
- Remove the space in "character set" in the syntax of ProxyFtpDirCharset to avoid confusion (it is 1 parameter only)
- Use the correct syntax for the "default" values, so that they are parsed and correctly displayed in 'quickreference'
- Remove extra [] when directive's parameter are required

- correct the default password: apache-proxy@ instead of apache_proxy@.
This was silently changed in r88745, 17 years ago!

(r1838313 in trunk + some style to synch 2.4.x and trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838314 13f79535-47bb-0310-9956-ffa450edef68
2018-08-18 07:56:02 +00:00
a6a84c7a43 Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772, r1832351, r1832951, r1815004 from trunk:
Don't claim "BIO dump follows" if it is not logged due to log level config.


make ssl_io_data_dump respect per-conn loglevel


add high trace level log messages for debugging buffering and write completion


* modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail
  if RAND_bytes() fails; possible per API, although not in practice
  with the OpenSSL implementation.


Fix typo in log message.


ap_add_common_vars(): use apr_pstrmemdup().

This avoids a transient replacement/restore of '?' by '\0' in r->filename.


Use 'ap_request_has_body()' instead of duplicating its implemenation.

The logic in 'ap_request_has_body()' is:
    has_body = (!r->header_only
                && (r->kept_body
                    || apr_table_get(r->headers_in, "Transfer-Encoding")
                    || ( (cls = apr_table_get(r->headers_in, "Content-Length"))
                        && (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)
                        && (!*estr)
                        && (cl > 0) )
                    )
                );
So the test is slighly different from the original code. (but this looks fine to me)

This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.

While at it, move the test '!r->expecting_100' a few lines above because it is cheap.

PR62368: Print the unparsed URI in AH03454

... to include r->args and get otherwise get as close to possible to
what came in over the wire.

Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener




All error handling paths of this function call 'apr_brigade_destroy()' , except this one.
So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53016

* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool
  for debugging unless debug-level logging is enabled.  No functional change.


mod_watchdog: Correct some log messages and fix
compiler warning
"'rv' may be used uninitialized in this function".

Follow up to r1722154.

Submitted by: sf, jorton, jorton, ylavic, jailletc36, covener, jailletc36, jorton, rjung
Reviewed by: jailletc36, jim, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838103 13f79535-47bb-0310-9956-ffa450edef68
2018-08-15 15:01:08 +00:00
965920c439 Merge r1801143 from trunk:
mpm_winnt: Don't forget to close the I/O completion port as part of the
cleanup in the child process.

Submitted by: kotkov
Reviewed by: jailletc36, ylavic (by inspection), covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838102 13f79535-47bb-0310-9956-ffa450edef68
2018-08-15 14:52:43 +00:00
30ab0def1c Merge r1797844 from trunk:
allow quoted paths in <IfFile>

The boilerplate code for config sections conflicts with TAKE1
because of the trailing stuff to terminate the opening tag.

Change from TAKE1 to RAW_ARGS and call ap_getword_conf()
directly.





git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838053 13f79535-47bb-0310-9956-ffa450edef68
2018-08-14 21:03:42 +00:00
b89cdf0e69 Merge r1809135 from trunk:
On the trunk:

mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838052 13f79535-47bb-0310-9956-ffa450edef68
2018-08-14 20:56:54 +00:00
46059c0b7c Vote+promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838039 13f79535-47bb-0310-9956-ffa450edef68
2018-08-14 17:32:23 +00:00
5a84f47828 and promote those with 3 +1s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838015 13f79535-47bb-0310-9956-ffa450edef68
2018-08-14 12:21:52 +00:00
9d5b18a094 backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838014 13f79535-47bb-0310-9956-ffa450edef68
2018-08-14 12:21:13 +00:00
b089d0e2bc Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837834 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 20:30:07 +00:00
08476fb554 vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837803 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 13:39:56 +00:00
e07aa46faf Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837769 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 03:35:34 +00:00
ac2fe2427e Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837663 13f79535-47bb-0310-9956-ffa450edef68
2018-08-08 17:20:35 +00:00
8a86daa4ed quick fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837654 13f79535-47bb-0310-9956-ffa450edef68
2018-08-08 14:53:56 +00:00
3927579a4d Merge r1836469, r1836154 from trunk:
* config.layout: Allow configure --localstatedir to over-ride /var/www 
  location in Fedora layout.


* Makefile.in (install-suexec*): Fix make -jN install.

Submitted by: Arkadiusz Miskiewicz <arekm maven.pl>

Submitted by: jorton
Reviewed by: jorton, covener, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837645 13f79535-47bb-0310-9956-ffa450edef68
2018-08-08 11:48:15 +00:00
5323a97e5c promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837644 13f79535-47bb-0310-9956-ffa450edef68
2018-08-08 11:46:52 +00:00
585e27a3cc vote on some backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837643 13f79535-47bb-0310-9956-ffa450edef68
2018-08-08 11:46:19 +00:00
91fcde4bbb Propose a few monitoring improvements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837599 13f79535-47bb-0310-9956-ffa450edef68
2018-08-07 14:19:31 +00:00
28a2ff5bb7 vote/comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837467 13f79535-47bb-0310-9956-ffa450edef68
2018-08-05 14:15:25 +00:00
00cbe94e09 Fix comment in mod_lua and docs.
s/addoutputfilter/add_output_filter/
See PR 62359
(r1837404 on trunk)

Note: .c file is patch without any vote because it is only a comment in order to be consistent with the doc and the code, and mod_lua is marked as experimental.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837405 13f79535-47bb-0310-9956-ffa450edef68
2018-08-04 08:09:54 +00:00
1e64e9f7b9 update backport prop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837368 13f79535-47bb-0310-9956-ffa450edef68
2018-08-03 13:17:28 +00:00
22f73922fc On the 2.4.x branch:
backport of r1837357 from trunk.
  *) mod_md: When the last domain name from an MD is moved to another one,
     that now empty MD gets moved to the store archive. PR 62572.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837358 13f79535-47bb-0310-9956-ffa450edef68
2018-08-03 10:54:47 +00:00
1e606a9860 Propose mod_socache_redis as backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837233 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 12:54:54 +00:00
4b87b4a3c9 backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837226 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 11:58:52 +00:00
c7ccdfaf27 rebuilt added misc index.html.es ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837206 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 01:15:48 +00:00
b460f8e3dd rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837205 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:56:32 +00:00
9f1dc1fe89 rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837204 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:44:00 +00:00
c44796aa30 rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837203 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:29:33 +00:00
6cd403b60e forgot to commit html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837202 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:20:07 +00:00
f926dfe057 rebuilt spanish docs to match eng rev of ssi
translated adding ssi spanish doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837201 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:17:49 +00:00
176e15ff72 built and update file http2.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837200 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:08:43 +00:00
5bcfa9d7d6 rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837199 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:01:15 +00:00
dc576e5208 rebuilt spanish docs access.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837198 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 00:00:43 +00:00
c98473f0f9 rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837196 13f79535-47bb-0310-9956-ffa450edef68
2018-07-31 23:38:04 +00:00