- Jun 06, 2016
-
-
Jim Jagielski authored
Add the <!--#comment ... --> syntax. Idea from Rob. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1747054 13f79535-47bb-0310-9956-ffa450edef68
-
- May 23, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1745137 13f79535-47bb-0310-9956-ffa450edef68
-
- May 21, 2016
-
-
Jim Jagielski authored
Merge r1722177, r1722195, r1722229, r1722320, r1722328, r1722334, r1722350, r1722351, r1722358, r1722377, r1723953, r1724879, r1724992, r1724993, r1724995, r1725018, r1725031, r1725120, r1725328, r1725387, r1725489, r1725498, r1725499, r1725523, r1725545, r1725567, r1725581, r1725602, r1725822, r1725967, r1726038, r1726049, r1726051, r1726052, r1726055, r1725090, r1728326, r1737020 from trunk: Commit framework impl of health-check module plus required changes. The actual health checking is currently in progress, but wanted to add in at this stage. Make aware of new status: Failed Health Check. Store the number of current passes/fails in shm finish looping logic... place-holder for actual checking Better check move to per server conf, useful for adding HealthCheckCondition Now implement the condition ruleset definition. The actual checking will be done in the actual health check routine. just check watched servers... use 'hc' prefix for sub directives Check that we have names for both templates and conditions command changes Don't bother w/ methods that return bodies. We don't handle them now anyway. Use enums and structs to keep things better organized 1st cut of 'simple' tcp check... We reuse various proxy function and so this *could* be more streamlined, but use this to show how the other would work, since we need brigades, SSL/TLS support, etc. Since every check needs this, do this in the main check loop. Allows some optimizations. move scope pull this out... large enough for a func Move to a set of health check workers, mapping to each worker itself, instead of a single reused generic worker. some ordering optimization Make balancer manager health-check aware And we now allow for health checks via OPTIONS * Leverage the OPTIONS code for HEAD as well... So we now support: TCP, OPTIONS and HEAD. Right now, anything other than an error (even a 404) is consider a PASS. Fill in APLOGNO. I hope that doesn't result in merge trouble for Jim. Open up hook/scar to allow for passes/fails and method to be changed via bal-man... OPTIONS/HEAD proxy function should be diff from simple TCP check For OPTIONS and HEAD, only 2xx and 3xx are considered "passing" (until I implement the conditions expr testing)... honor the pass/fail count and LOG_INFO when the health check enables or disables a backend worker. Start impl of expr conditions for runtime checks Adjust log levels correct error string Use worker status character defines taken from mod_proxy.h instead of explicit characters. Noted by rpluem. With the updated ap_expr, we can now check for the returned response body, stored in kept_body Assign log message tags Implement expr lookup in mod_proxy_hcheck for variables whose names start with "HC_" and for the new function hc(). Currently only HC_BODY and hc(body) are supported. Both return the saved body of the health check response to be used in an expr that decides about success of a check. Fix copy&paste error in new function. Try fixing new proxy_hcheck expr extension. Interestingly mod_ssl using NULL as well, but some other module I wrote uses parms->name. Adjust clash :) Enabling a worker via health-check also moves them out of ERROR more (which may have been set via the static "health" check done via mod_proxy). Some flow improvements... Submitted by: jim, rjung, jim, jim, jim, jim, jim, jim, rjung, jim, jim, rjung, rjung, rjung, jim, jim, olegk, jim, jim Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1744951 13f79535-47bb-0310-9956-ffa450edef68
-
- May 19, 2016
-
-
Eric Covener authored
bump CVE to the top git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1744591 13f79535-47bb-0310-9956-ffa450edef68
-
- May 18, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1744420 13f79535-47bb-0310-9956-ffa450edef68
-
- May 14, 2016
-
-
Stefan Eissing authored
Merge of 1742260,1742359,1742444,1742445,1742446,1742447,1742460,1743335,1743517,1743788 from trunk: mod_http2/mod_proxy_http2 update with latest changes from trunk to 1.5.4. Update of CMake and Netware makefiles. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1743815 13f79535-47bb-0310-9956-ffa450edef68
-
- May 12, 2016
-
-
Jim Jagielski authored
let proxy handler forward ALPN protocol strings for ssl proxy connections Remove leftover comment Remove leftover comment APLOGNO update for mod_proxy_http2 fix APLOGNO at wrong place, me stupid h2_proxy_session: fill in missing APLOGNO()s. Submitted by: icing, jailletc36, jailletc36, icing, icing, ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1743576 13f79535-47bb-0310-9956-ffa450edef68
-
- May 11, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1743337 13f79535-47bb-0310-9956-ffa450edef68
-
- May 05, 2016
-
-
Rainer Jung authored
from empty lines. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1742441 13f79535-47bb-0310-9956-ffa450edef68
-
- May 04, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1742288 13f79535-47bb-0310-9956-ffa450edef68
-
- May 03, 2016
-
-
Ruediger Pluem authored
Ensure http2 follows http in the meaning of status WRITE (meaning 'in the request processing phase' even if still consuming the request body, not literally in a 'now writing' state). Ensure a number of MPMs and the h2 connection io no longer clobber the request status line during state-only changes. While at it, clean up some very ugly formatting and unnecessary decoration, and avoid the wordy _from_conn() flavor when we are not passing a connection_rec. Ensure the useragent_ip is only used in the case where it has been initialized, fall back on the connection's remote_ip if the status is accidently updated from an uninitialized request_rec. Revert to 2.4.1 behavior and null the request and vhost as appropriate. PR: 59333 Submitted by: wrowe Reviewed by: wrowe, ylavic, rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1742179 13f79535-47bb-0310-9956-ffa450edef68
-
- Apr 28, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1741419 13f79535-47bb-0310-9956-ffa450edef68
-
- Apr 27, 2016
-
-
Jeff Trawick authored
(and adjust version info in CHANGES, ap_mmn comment, core.xml) core: New CGIVar directive can configure REQUEST_URI to represent the current URI being processed instead of always the original request. Submitted by: trawick Reviewed by: ylavic, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1741250 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
scoreboard/status: Keep previous worker connection/request data when idle as prior to 2.4.20. scoreboard/status: follow up to r1739008. Restore (completely) pre-2.4.20 behaviour w.r.t. preserved values. r1739008 was still unnessessarily blanking some values for the time of BUSY_READ -> BUSY_WRITE (with blocking MPMs). scoreboard/status: follow up to 1739146. Comment not needed anymore... Clarify CHANGES entry, including the correct version for the restored behaviour. Submitted by: ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1741240 13f79535-47bb-0310-9956-ffa450edef68
-
- Apr 20, 2016
-
-
Stefan Eissing authored
mod_http2: disabling mmap on file buckets, changing r->protocol to HTTP/2.0 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1740112 13f79535-47bb-0310-9956-ffa450edef68
-
- Apr 07, 2016
-
-
Rainer Jung authored
in 2.4.7. The change affects third party modules using the mod_proxy shared memory structure proxy_worker_shared. Examples are third party balancer lbmethod modules. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1738184 13f79535-47bb-0310-9956-ffa450edef68
-
- Apr 04, 2016
-
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737701 13f79535-47bb-0310-9956-ffa450edef68
-
- Apr 01, 2016
-
-
Ruediger Pluem authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737393 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
Fix bug 58528 - Do not read .htaccess if override and overridelist are "None" Submitted by: druggeri Reviewed by: druggeri, ylavic, wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737366 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
mod_proxy_express: Fix possible use of DB handle after close. PR 59230. Submitted by: Petr <pgajdos suse.cz> Reviewed by: ylavic, trawick, wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737363 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
core/util_script: relax alphanumeric filter of enviroment variable names on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al. unadulterated in 64 bit versions of Windows. PR 46751. Submitted by: gsmith Reviewed by: jailletc36, sf, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737360 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 31, 2016
-
-
Stefan Eissing authored
mod_http2: backport of version 1.4.6 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737255 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 24, 2016
-
-
Stefan Eissing authored
mod_http2: fix for scoreboard updates missing, mem leak fix for slave connections git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736465 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 23, 2016
-
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736312 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 21, 2016
-
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736069 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736067 13f79535-47bb-0310-9956-ffa450edef68
-
Jeff Trawick authored
mod_include now sets DOCUMENT_ARGS. * Like DOCUMENT_URI, this is for the SSI document, not for any subrequest called for the include directive. * Like QUERY_STRING, this is just r->args (or empty string if there are none), unlike QUERY_STRING_UNESCAPED. The name of the variable is taken from the Zeus SSI implementation. Follow-up to r1734817: suexec passes through mod_include's DOCUMENT_ARGS Follow-up to r1734817: Reorder, mention compatibility Submitted by: trawick Reviewed by: jim, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735963 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735955 13f79535-47bb-0310-9956-ffa450edef68
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735927 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 20, 2016
-
-
Jim Jagielski authored
mod_ssl: Add hooks to allow other modules to perform processing at several stages of initialization and connection handling. See mod_ssl_openssl.h. This is enough to allow implementation of Certificate Transparency outside of mod_ssl. Initialize post_handshake_rc for case where a failure has already occurred (doesn't change execution but avoids warning with some levels of gcc). Pointed out by: kbrand Submitted by: trawick Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735886 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 19, 2016
-
-
Jim Jagielski authored
* mod_ssl: Free dhparams when getting DH params. This fixes issue when SSLCryptoDevice does not get unregistered because of non-zero refcount during the mod_ssl unload happening on httpd startup. mod_ssl: follow up to r1720129. Free ecparams read from certificate file(s) on startup. Follow up to r1720129 and r1723295: CHANGES entry. Rephrase r1733088 since leaking means horrible things in cryptography. This is not a security fix :p Submitted by: jkaluza, ylavic, ylavic, ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735770 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
expr support for HTTP2 variable Submitted by: icing Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735769 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 18, 2016
-
-
Yann Ylavic authored
Since ssl_run_pre_handshake() is not (yet) in 2.4.x, mention ssl_init_ssl_connection() instead. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735650 13f79535-47bb-0310-9956-ffa450edef68
-
Stefan Eissing authored
mod_http2: stream cleanup on GOAWAY handling, PUSHes prohibited after client GOAWAY. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735610 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 17, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735457 13f79535-47bb-0310-9956-ffa450edef68
-
Stefan Eissing authored
Ensure that httpd exits with an error status when the MPM fails to run. [Yann Ylavic] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735381 13f79535-47bb-0310-9956-ffa450edef68
-
Stefan Eissing authored
[PATCH] mod_rewrite: double escaping of query strings in server context (like PR50447, for server context) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735379 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 16, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735239 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 14, 2016
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1734917 13f79535-47bb-0310-9956-ffa450edef68
-
- Mar 10, 2016
-
-
Stefan Eissing authored
mod_reqtimeout: Prevent long response times from triggering a timeout once the request has been fully read. PR 59045. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1734416 13f79535-47bb-0310-9956-ffa450edef68
-