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

30080 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
Lucien Gentis
869fbe09de Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803657 13f79535-47bb-0310-9956-ffa450edef68
2017-08-01 15:37:03 +00:00
Lucien Gentis
0fee2b3e0c XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803655 13f79535-47bb-0310-9956-ffa450edef68
2017-08-01 15:35:41 +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
1e4868accc Follow up to r1803396: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803398 13f79535-47bb-0310-9956-ffa450edef68
2017-07-29 23:21:58 +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
Eric Covener
b1c493dd08 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803314 13f79535-47bb-0310-9956-ffa450edef68
2017-07-28 17:46:12 +00:00
Eric Covener
cd4b77d6b0 cross link some balancer directives across proxy mods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803313 13f79535-47bb-0310-9956-ffa450edef68
2017-07-28 17:45:35 +00:00
Luca Toscano
9b9acb8a6b Doc rebuild (reverts r1802703)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803306 13f79535-47bb-0310-9956-ffa450edef68
2017-07-28 17:16:47 +00:00
Luca Toscano
985b913a68 mod_proxy doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803255 13f79535-47bb-0310-9956-ffa450edef68
2017-07-28 09:14:34 +00:00
Luca Toscano
23ee4aa62b mod_proxy.xml: mention DNS caching when reusing backend connection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803254 13f79535-47bb-0310-9956-ffa450edef68
2017-07-28 09:10:37 +00:00
Luca Toscano
579e1799fb Clarify some mod_proxy concepts in the docs
I have recently got some basic mod-proxy concepts
and these simple info would have helped me a lot:

- connection pooling == reuse. My brain did not pick
  up this simple nomenclature at first read for some
  reason, probably because we have parameters called
  "*reuse*" and not "*pooling*". I find the term
  "reuse" clearer than "pooling", but this is
  debatable :)
- the concept of "Worker" needs to be read before
  the ProxyPass section (that people probably read
  directly after checking a search engine) to fully
  understand its power.
- the fact that a worker is related to a single process
  (and not shared as a Balancer) is a really important
  concept that I tried to highlight when talking
  about maxconns (question popped up a lot of times
  from users).

Hope that my understanding is correct, feedback is welcome.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803171 13f79535-47bb-0310-9956-ffa450edef68
2017-07-27 12:30:20 +00:00
Yann Ylavic
cd44f23dbb event: Avoid possible blocking in the listener thread when shutting down
connections. PR 60956.

start_lingering_close_nonblocking() now puts connections in defer_linger_chain
which is emptied by any worker thread (all atomically) after its usual work,
hence any possibly blocking flush and lingering close run outside the listener.

The listener may create a dedicated worker if it fills defer_linger_chain or
while it's not empty, calling push2worker with a NULL cs.

The state machine in process_socket() is slighly modified to be able to enter
with CONN_STATE_LINGER directly w/o clogging_input_filters to interfer.

New abort_socket_nonblocking() allows to reset connections when nonblocking is
required and we can't do much about the connection anymore, nor we want the
system to linger on its own after close().

Many thanks to Stefan Priebe for his heavy testing on many event's changes!



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802875 13f79535-47bb-0310-9956-ffa450edef68
2017-07-24 23:19:06 +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
Lucien Gentis
e3803ddc38 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802703 13f79535-47bb-0310-9956-ffa450edef68
2017-07-22 15:31:35 +00:00
Lucien Gentis
3a42b12b6d XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802702 13f79535-47bb-0310-9956-ffa450edef68
2017-07-22 15:30:37 +00:00
Yann Ylavic
21160f8864 core, mpm_event: Add ap_update_sb_handle() to avoid a small memory leak of
sizeof(ap_sb_handle_t) when re-entering event's process_socket().



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802618 13f79535-47bb-0310-9956-ffa450edef68
2017-07-21 17:22:05 +00:00
Yann Ylavic
7ea6d8b113 mpm_event: ap_queue_info_try_get_idler() may atomically decrement and then
re-increment the number idlers if it went under or to zero.  We can avoid
this by switching to a compare-and-swap scheme.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802535 13f79535-47bb-0310-9956-ffa450edef68
2017-07-20 23:34:47 +00:00
Jim Jagielski
7157b8a35e reserve 10036
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802399 13f79535-47bb-0310-9956-ffa450edef68
2017-07-19 14:49:38 +00:00
Jim Jagielski
46466f34d2 update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802338 13f79535-47bb-0310-9956-ffa450edef68
2017-07-18 21:01:55 +00:00
Jim Jagielski
2a3f6ec221 UDS does support reuse
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802336 13f79535-47bb-0310-9956-ffa450edef68
2017-07-18 21:00:14 +00:00
Yann Ylavic
72658bb425 ap_server_config_defines and ap_server_{pre,post}_read_config are arrays of
*const* strings (must not change after being inserted), make it explicit.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802309 13f79535-47bb-0310-9956-ffa450edef68
2017-07-18 15:06:15 +00:00
Yann Ylavic
7f548a8cda Be explicit and safe (const) with the strings stored in ap_server_config_defines.
Follow up to r1713043.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802305 13f79535-47bb-0310-9956-ffa450edef68
2017-07-18 14:41:43 +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
f21bbb5659 mod-proxy documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802076 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 16:05:07 +00:00
Daniel Ferradal
073f1b8d7c Updated files referencing Spanish translation for manual/misc/index.xml.es r1802071
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802072 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 15:36:33 +00:00
Daniel Ferradal
6805fe3241 Added Spanish Translation for manual/misc/index.xml.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802071 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 15:35:05 +00:00
Daniel Ferradal
7850077f09 Updated files referencing Spanish translation for manual/misc/perf-scaling.xml.es r1802068
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802069 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 15:15:16 +00:00
Daniel Ferradal
92ee2a4b9b Added Spanish Translation for manual/misc/perf-scaling.xml.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802068 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 15:13:13 +00:00
Daniel Ferradal
6840158199 Added Updates to Extra files referencing Spanish translation for manual/misc/password_encryptions.xml.es r1802066
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802067 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 14:51:11 +00:00
Daniel Ferradal
c4e31dba08 Added Spanish translation for manual/misc/password_encryptions.xml.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802066 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 14:49:08 +00:00
Daniel Ferradal
95e7a85098 Updated Spanish translation for manual/howto/reverse_proxy.xml.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802064 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 14:39:21 +00:00
Daniel Ferradal
ced1faf4d2 Added Extra Files referencing Spanish translation for manual/howto/ssi.xml.es r1802060
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802061 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 14:18:21 +00:00
Daniel Ferradal
580bc01a85 Added Spanish translation for manual/howto/ssi.xml.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802060 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 14:15:22 +00:00
Daniel Ferradal
469830d1a0 Added Extra Files referencing Spanish translation for manual/mod/mod_auth_basic.xml.es r1802042
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802043 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 11:11:51 +00:00
Daniel Ferradal
bda5f5ebe3 Added Spanish translation for manual/mod/mod_auth_basic.xml.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802042 13f79535-47bb-0310-9956-ffa450edef68
2017-07-16 11:08:27 +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
Jacob Champion
2302082b33 httpdunit: merge CVE-2017-9788 regression tests from feature branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801998 13f79535-47bb-0310-9956-ffa450edef68
2017-07-14 22:33:45 +00:00
Jacob Champion
0dc9280e94 CVE-2017-9788: add unit tests for get_digest_rec()
Including the module source is a dirty hack, but maybe the direct way is
best for now. More functional tests are still TODO.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1801996 13f79535-47bb-0310-9956-ffa450edef68
2017-07-14 22:30:17 +00:00
Yann Ylavic
961e317d9b Follow up to r1801994: CHANGES' PR reference.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801995 13f79535-47bb-0310-9956-ffa450edef68
2017-07-14 22:28:38 +00:00