Skip to content
GitLab
  1. 03 Apr, 2017 1 commit
  3. 31 Mar, 2017 1 commit
  5. 28 Mar, 2017 4 commits
  7. 24 Mar, 2017 5 commits
    • Jacob Champion's avatar
      Merge r1783842 from trunk: · 0f41a01f
      Jacob Champion authored 
      mod_cache: Fix a regression in 2.4.25 for the forward proxy case by
computing and using the same entity key according to when the cache
checks, loads and saves the request.  PR 60577.

Submitted by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788511 13f79535-47bb-0310-9956-ffa450edef68
      0f41a01f
    • Jacob Champion's avatar
      Merge r1779573 from trunk: · a3951ed2
      Jacob Champion authored 
      mod_proxy_hcheck: thread-safety.
Use the thread pool everywhere for the needs/lifetime of the request to
the backend.

Submitted by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788510 13f79535-47bb-0310-9956-ffa450edef68
      a3951ed2
    • Jim Jagielski's avatar
      Merge r1780095 from trunk: · bbccb628
      Jim Jagielski authored 
      Fix %{DOCUMENT_URI} in SSI w/ default parser

  *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
     URI originally requsted by the user, not the nested documents URI. This
     restores the behavior of this variable to match the "legacy" SSI parser.
     PR60624. 

Submitted By [Hank Ibell <hwibell gmail.com>]


Submitted by: covener
Reviewed by: covener, wrowe, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788448 13f79535-47bb-0310-9956-ffa450edef68
      bbccb628
    • Jim Jagielski's avatar
      Merge r1780328, r1780329, r1781329, r1782164, r1782166, r1782193, r1778350,... · a4c7dcce
      Jim Jagielski authored 
      Merge r1780328, r1780329, r1781329, r1782164, r1782166, r1782193, r1778350, r1781329, r1782194, r1782323, r1782418, r1782419, r1782482, r1782532, r1788040 from trunk:

Adjust as needed

debugging

add ProxyFCGISetEnvIf


Logging update

Follow up to r1782164: fix typo (closing double-quote).

Remove trailing whitespace : no functional change

PR60576: php-fpm broken w/ per-dir rewrites

Attempt to dig out of well-meaning fixes for generic fcgi backends
that negatively affected some FPM configs.

Adds ProxyFCGIBackendType 


add ProxyFCGISetEnvIf


trailing whitespace

Allow final admin-level fine-tuning

mod_proxy_fcgi: fix spelling in APLOG_INFO message

mod_proxy_fcgi: allow setting empty variables in ProxyFCGISetEnvIf

support unsetting vars



ProxyFCGISetEnvIf: reject invalid invocations, streamline unsets

Neither of the following makes sense:
- ProxyFCGISetEnvIf cond !VARIABLE value
- ProxyFCGISetEnvIf cond !

Error out in these cases. Also, don't execute the (unused) replacement
expression when unsetting.

drop the longhand version


Submitted by: jim, covener, jim, ylavic, jim, covener, covener, jim, jim, jchampion, jchampion, covener, jchampion, covener
Reviewed by: jim, covener, jchampion


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788445 13f79535-47bb-0310-9956-ffa450edef68
      a4c7dcce
    • Yann Ylavic's avatar
      Merge r1781187, r1781190, r1781312 from trunk: · 7d709917
      Yann Ylavic authored 
      mod_ssl: work around leaks on (graceful) restart.

Tested with valgrind and --with-ssl shared/static.


mod_ssl: follow up to r1781187.
The ssl_util_thread_*() functions are not necessary with openssl-1.1+


mod_ssl: follow up to r1781187.
Address SSL_CTX leak in (merged) proxy_ctx.


Reviewed by: ylavic, jim, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788442 13f79535-47bb-0310-9956-ffa450edef68
      7d709917
  9. 20 Mar, 2017 1 commit
  11. 17 Mar, 2017 2 commits
  13. 12 Mar, 2017 1 commit
  15. 01 Mar, 2017 1 commit
  17. 22 Feb, 2017 1 commit
  19. 17 Feb, 2017 1 commit
  21. 15 Feb, 2017 1 commit
  23. 14 Feb, 2017 1 commit
  25. 09 Feb, 2017 1 commit
  27. 08 Feb, 2017 1 commit
  29. 02 Feb, 2017 2 commits
  31. 27 Jan, 2017 1 commit
    • Stefan Eissing's avatar
      On the 2.4.x branch: · 086285f0
      Stefan Eissing authored 
      Merge of r1779979,1780159,1780576,1780596 from trunk:
M    modules/http2/h2_bucket_beam.c
     fix for possible duplicate free of send/recv pools
M    modules/http2/h2_from_h1.c
     suppress generating responses on aborted slave connections
M    modules/http2/h2_session.c
     regression: stream ongoing streams on graceful shutdown to the end
M    modules/http2/h2_version.h



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1780597 13f79535-47bb-0310-9956-ffa450edef68
      086285f0
  33. 23 Jan, 2017 1 commit
  35. 21 Jan, 2017 1 commit
  37. 13 Jan, 2017 1 commit
  39. 09 Jan, 2017 3 commits
  41. 04 Jan, 2017 1 commit
  43. 03 Jan, 2017 1 commit
  45. 31 Dec, 2016 1 commit
  47. 23 Dec, 2016 3 commits
    • Stefan Eissing's avatar
      On the 2.4.x branch: merge of r1775833 from trunk: · 524b8a70
      Stefan Eissing authored 
      Cleanup mod_http2 beamer registry on server reload. Fixes PR60510.

* modules/http2/h2_bucket_beam.c
  register cleanup function on installation that NULLs the beamer
  registry on pool cleanup.

Patch by: Pavel Mateja <pavel@verotel.cz
         me



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1775834 13f79535-47bb-0310-9956-ffa450edef68
      524b8a70
    • Jim Jagielski's avatar
      Merge r1775770 from trunk: · bb24a05d
      Jim Jagielski authored 
      pass along error buckets

In 2.4, they are generated by LimitRequestBody failures. trunk no 
longer uses error buckets in this path, but someone else could.

PR60375

Submitted By: Eric Covener,Lubos Uhliarik <luhliari  redhat.com>
Committed By: covener



Submitted by: covener
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1775832 13f79535-47bb-0310-9956-ffa450edef68
      bb24a05d
    • Stefan Eissing's avatar
      On the 2.4.x branch: · 94eee93b
      Stefan Eissing authored 
      Merge r1775813 from trunk:

Fix mod_h2/github issue #126: correct lifetime of data sent on temp pools

* modules/http2/h2_bucket_beam.c 
 - ignore send pools that are sub-pools of the existing one
 - added h2_beam_send_from() to allow explicit registering of the
   correct pool for the sending

* modules/http2/h2_bucket_beam.h
 - add prototype for h2_beam_send_from()

* modules/http2/h2_mplx.c
 - adding logging of output beam state

* modules/http2/h2_stream.c
 - register stream pool for sending data on input beam

* modules/http2/h2_task.c
 - register task pool on output beam on creation
 - adding trace logging

* modules/http2/h2_proxy_session.c
 - fixing a type in a comment while we're at it



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1775816 13f79535-47bb-0310-9956-ffa450edef68
      94eee93b
  49. 16 Dec, 2016 3 commits