1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00

10471 Commits

Author SHA1 Message Date
Stefan Eissing
13ee3b3ecf mod_md: v0.6.1 from github
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804529 13f79535-47bb-0310-9956-ffa450edef68
2017-08-09 13:43:26 +00:00
Stefan Eissing
4ee5a66bd6 mod_md: v0.6.0 from github
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804424 13f79535-47bb-0310-9956-ffa450edef68
2017-08-08 13:50:20 +00:00
Stefan Eissing
266f140fa8 mod_ssl uses now mod_md header file for optional function declaration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804422 13f79535-47bb-0310-9956-ffa450edef68
2017-08-08 13:33:45 +00:00
Stefan Eissing
ceeed43c79 adding a2md build to modules/md, installed in bin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804405 13f79535-47bb-0310-9956-ffa450edef68
2017-08-08 12:08:42 +00:00
Stefan Eissing
8349ec1561 building separate lib and static linking it into mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804402 13f79535-47bb-0310-9956-ffa450edef68
2017-08-08 11:37:48 +00:00
Stefan Eissing
30763980f9 first configure+compile version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804123 13f79535-47bb-0310-9956-ffa450edef68
2017-08-04 13:47:25 +00:00
Stefan Eissing
a2f0c639f3 bumping version, removing some unused code, fixes in base64url from mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1804096 13f79535-47bb-0310-9956-ffa450edef68
2017-08-04 11:03:08 +00:00
Stefan Eissing
81337c3911 mod_http2: non-dev version for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1804090 13f79535-47bb-0310-9956-ffa450edef68
2017-08-04 10:15:14 +00:00
Stefan Eissing
e7a858c2bd branch for integrating mod_md into trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804087 13f79535-47bb-0310-9956-ffa450edef68
2017-08-04 09:52:04 +00:00
Stefan Eissing
6b65199440 mod_http2: signalling produce IO before waiting on beam buffer to drain.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803454 13f79535-47bb-0310-9956-ffa450edef68
2017-07-30 18:54:15 +00:00
Stefan Eissing
e8a012377c mod_http2: version bump, partial fix for stream response getting stuck, see https://github.com/icing/mod_h2/issues/143
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803420 13f79535-47bb-0310-9956-ffa450edef68
2017-07-30 11:57:35 +00:00
Yann Ylavic
31a4103652 mod_ssl, ab: compatibility with LibreSSL. PR 61184.
LibreSSL defines OPENSSL_VERSION_NUMBER = 2.0, but is not compatible with
all of the latest OpenSSL 1.1 API.

Address this by defining MODSSL_USE_OPENSSL_PRE_1_1_API which is true for
anything but OpenSSL >= 1.1 (for now).

Proposed by: Bernard Spil <brnrd freebsd.org>
Reviewed by: ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803396 13f79535-47bb-0310-9956-ffa450edef68
2017-07-29 23:05:02 +00:00
Yann Ylavic
36d01334ab mod_ssl: we can't use SSL_COMP_free_compression_methods() if OPENSSL_NO_COMP
is defined.  PR 61206.

Submitted by: Michael Schlenker <msc contact.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803392 13f79535-47bb-0310-9956-ffa450edef68
2017-07-29 20:35:56 +00:00
Jim Jagielski
e85309d373 Make sure updatelbstatus() is NULL
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802845 13f79535-47bb-0310-9956-ffa450edef68
2017-07-24 17:19:55 +00:00
Joe Orton
52ecea1e1e Fix overriding ExtendedStatus to "off" with mod_systemd loaded, and
give more feedback to systemd during a reload.

* modules/arch/unix/mod_systemd.c (systemd_pre_config): New
  function; tell systemd the service is reloading here.
  (systemd_pre_mpm): Don't set ap_extended_status here, do nothing
  if ExtendedStatus is off.
  (register_hooks): Register pre_config hook.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802251 13f79535-47bb-0310-9956-ffa450edef68
2017-07-18 08:14:42 +00:00
Luca Toscano
aae1c23f32 mod_proxy_fcgi: Add the support for mod_proxy's
flushpackets and flushwait params

This change was requested on the development mailing
list in order to fill another gap between mod_fcgi
and mod_proxy_fcgi, namely the -flush funtionality.

The more evolved core trunk code would not need this
feature becuse of the non-blocking writes, but it
is be needed in 2.4.x.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802040 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 08:40:46 +00:00
Jean-Frederic Clere
de15a34dc8 Add logic to read the Upgrade header and use it in the response.
Use we you are proxying to a server that has multiple upgrade on the same IP/Port.
PR 61142


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801594 13f79535-47bb-0310-9956-ffa450edef68
2017-07-11 11:41:44 +00:00
Stefan Eissing
1693e8678b On the trunk:
mod_http2: Simplify ready queue, less memory and better performance. Update
     mod_http2 version to 1.10.7.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800978 13f79535-47bb-0310-9956-ffa450edef68
2017-07-06 08:15:27 +00:00
William A. Rowe Jr
b680a69533 Correct string scope to prevent duplicated values for subsequent tokens.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800919 13f79535-47bb-0310-9956-ffa450edef68
2017-07-05 19:44:30 +00:00
William A. Rowe Jr
e445cf5181 Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"
comparisons.

Submitted by: wrowe, Robert Święcki <robert swiecki.net>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800917 13f79535-47bb-0310-9956-ffa450edef68
2017-07-05 19:42:30 +00:00
Rainer Jung
7ed2bd2e8b Fix another mod_lua compile error.
Compilation now tested against Lus 5.1, 5.2
and 5.3. The libs were compiled with COMPAT
flags set, but mod_lua no longer sets them
so it should compile and run with non-COMPAT
libs as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800833 13f79535-47bb-0310-9956-ffa450edef68
2017-07-04 22:14:13 +00:00
Rainer Jung
fe1923bb91 Fix new compilation breakage in mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800830 13f79535-47bb-0310-9956-ffa450edef68
2017-07-04 21:48:41 +00:00
Rainer Jung
4b3557a8e9 Mostly revert the configure compat check for
lua from r1785753. This should now no longer
be needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800819 13f79535-47bb-0310-9956-ffa450edef68
2017-07-04 20:49:53 +00:00
Rainer Jung
3490bd62b6 Fix last compat issue with Lua 5.2 and 5.3.
Patch taken from PR58188 which picked it from
openSUSE.

Still needs testing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800817 13f79535-47bb-0310-9956-ffa450edef68
2017-07-04 20:48:43 +00:00
Rainer Jung
d98ec3b059 More mod_lua compat for Lua 5.1, 5.2, 5.3.
One last use of luaL_register() with a non-NULL
"name" argument remaining.

Not tested yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800815 13f79535-47bb-0310-9956-ffa450edef68
2017-07-04 20:35:06 +00:00
Rainer Jung
d1105fd4f2 mod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3.
PR58188, PR60831, PR61245.

Still to solve: replace uses of luaL_register().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800809 13f79535-47bb-0310-9956-ffa450edef68
2017-07-04 19:22:23 +00:00
Stefan Eissing
7a8fab3a49 On the trunk:
mod_http2: disable and give warning when mpm_prefork is encountered. 
     The server will continue to work, but HTTP/2 will no longer be negotiated.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800689 13f79535-47bb-0310-9956-ffa450edef68
2017-07-03 15:44:54 +00:00
Jim Jagielski
9ed76be700 Partial reversal of r1800306... note virtual scripts in notes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800393 13f79535-47bb-0310-9956-ffa450edef68
2017-06-30 12:34:19 +00:00
Jacob Champion
856b65e315 proxy_fcgi: remove FPM-specific logic
Reverts r1780328, r1780329, and their associated followups, which
incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t
regression tests now pass.

PR: 61202

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800306 13f79535-47bb-0310-9956-ffa450edef68
2017-06-29 17:43:48 +00:00
Ruediger Pluem
81c622d8bf * Silence compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800126 13f79535-47bb-0310-9956-ffa450edef68
2017-06-28 06:50:00 +00:00
Christophe Jaillet
99ab47d8ef Since r1753257, "HEAD" method is registered into the registry hash with the M_GET ID.
(r1757672 in 2.4.x)

We iterate over all the values of the registery, so there is no need anymore to have a special case for "HEAD" in  'make_allow()'. It has its own entry now.

With the current code, we have "HEAD" 3 times in the Allow Header field.
This is because we find M_GET 2 times in the registry hash. The first one gives "GET" and "HEAD" (as the special handling), and the second "HEAD" and "HEAD" (as the special handling).


BTW, use APR_ARRAY_PUSH instead of hand coding it, in oder to have the code more readable.

PR 61207

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799784 13f79535-47bb-0310-9956-ffa450edef68
2017-06-25 06:09:43 +00:00
Jim Jagielski
7a9415519a OK... we display ms, since we want to be able to provide
values for <1sec, so entries should assume ms input when
using bal-mgr



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799485 13f79535-47bb-0310-9956-ffa450edef68
2017-06-21 16:29:54 +00:00
Jim Jagielski
d1c3e06c4a allow balancer-manager to also accept subsecond intervals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799482 13f79535-47bb-0310-9956-ffa450edef68
2017-06-21 16:24:00 +00:00
Jim Jagielski
428acaded3 Proxy timeout statements now sub-second granularity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799444 13f79535-47bb-0310-9956-ffa450edef68
2017-06-21 13:53:56 +00:00
Jim Jagielski
5cc32e6983 unused now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799438 13f79535-47bb-0310-9956-ffa450edef68
2017-06-21 13:21:55 +00:00
Jim Jagielski
30923668d1 Allow finer control over hcheck intervals... minimum is whatever
the watchdog slice is.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799437 13f79535-47bb-0310-9956-ffa450edef68
2017-06-21 13:21:18 +00:00
Jim Jagielski
09dc3b73d8 Allow WatchdogInterval to be sub 1 second
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799435 13f79535-47bb-0310-9956-ffa450edef68
2017-06-21 12:49:54 +00:00
Jim Jagielski
f3a8efb9d0 Not an error... last one is honored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799431 13f79535-47bb-0310-9956-ffa450edef68
2017-06-21 12:34:25 +00:00
Jacob Champion
dae00ddec8 httpdunit: merge to trunk from feature branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799378 13f79535-47bb-0310-9956-ffa450edef68
2017-06-20 23:42:12 +00:00
Ruediger Pluem
012229ec32 * The libnghttp2.pc might be found in lib64 on 64 bit systems
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799341 13f79535-47bb-0310-9956-ffa450edef68
2017-06-20 12:17:52 +00:00
Eric Covener
e46d22766e fix for RewriteOptions processing in r1798938
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799261 13f79535-47bb-0310-9956-ffa450edef68
2017-06-19 19:08:49 +00:00
Eric Covener
4fa0f6c103 add RewriteOptions LongURLOptimization
Variable expansion in RewriteCond causes strings to be duplicated
out of r->pool.  If the variables are long and many conditions
are evaluated, r->pool can get seriously bloated.

Clear the memory used for variable expansion for each set of conditons
once the set of conditions fails to match.


edit: revised in 1799261


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798938 13f79535-47bb-0310-9956-ffa450edef68
2017-06-16 15:13:03 +00:00
Ruediger Pluem
62e4ea6d2c Revert r1798456
* For the time being keep on caching OCSP_RESPONSE_STATUS_TRYLATER. The effect can be limited by setting SSLStaplingErrorCacheTimeout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798460 13f79535-47bb-0310-9956-ffa450edef68
2017-06-12 13:15:33 +00:00
Ruediger Pluem
f926fe46ee * Only report success, if had real one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798457 13f79535-47bb-0310-9956-ffa450edef68
2017-06-12 12:53:38 +00:00
Ruediger Pluem
a9aa6a82a4 * Do not cache OCSP_RESPONSE_STATUS_TRYLATER.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798456 13f79535-47bb-0310-9956-ffa450edef68
2017-06-12 12:49:06 +00:00
Ruediger Pluem
3bd26f8c6b * Mark OCSP_RESPONSE_STATUS_TRYLATER as error response
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798455 13f79535-47bb-0310-9956-ffa450edef68
2017-06-12 12:48:30 +00:00
Eric Covener
a30d71c824 remove taint checking from proxy_handler
rewrite tests with P flag in htaccess broken since r1792169


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797843 13f79535-47bb-0310-9956-ffa450edef68
2017-06-07 00:24:31 +00:00
Stefan Eissing
7a36c0fbfa On the trunk:
update after backport of mod_http2 fix.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797759 13f79535-47bb-0310-9956-ffa450edef68
2017-06-06 09:10:01 +00:00
Stefan Eissing
0541926064 On the trunk:
mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep
     the session in continuous check for state changes that never happen. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797745 13f79535-47bb-0310-9956-ffa450edef68
2017-06-06 07:58:57 +00:00
Eric Covener
6d14ff6cac whitespace and match 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797662 13f79535-47bb-0310-9956-ffa450edef68
2017-06-05 13:13:21 +00:00