Skip to content
GitLab
  1. 11 Sep, 2018 3 commits
    • Jim Jagielski's avatar
      Merge r1836381, r1836382, r1836383, r1836386, r1836603 from trunk: · 33899d95
      Jim Jagielski authored 
      * mod_proxy: Remove load order and link dependency between mod_lbmethod_*
  modules and mod_proxy by providing mod_proxy's ap_proxy_balancer_get_best_worker
  as an optional function.

PR: 62557


* Remove invalid copy and paste comments

* Always retrieve conditional function. static variable might contain garbage if module was reloaded in a static build.

* Add missing log numbers

* ap_proxy_balancer_get_best_worker cannot be exported and used as an optional
  function at the same time. So rename ap_proxy_balancer_get_best_worker to
  proxy_balancer_get_best_worker and make it static which is then used as an
  optional function and recreate ap_proxy_balancer_get_best_worker as an
  exported thin wrapper of proxy_balancer_get_best_worker.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1840548 13f79535-47bb-0310-9956-ffa450edef68
      33899d95
    • Jim Jagielski's avatar
      Merge r1801144, r1801148, r1801456 from trunk: · f62c6644
      Jim Jagielski authored 
      mpm_winnt: Factor out a helper function to parse the type of an accept
filter and use an appropriate enum for it.

This makes the code in winnt_accept() a bit easier to follow.  As a minor
side effect, it also fixes a small bug where the "unrecognized AcceptFilter
'%s'" log entry would always contain "none" instead of the actually
unrecognized kind of the accept filter.


mpm_winnt: Fix typo in the logged message in winnt_get_connection().


mpm_winnt: Following up on r1801144, use the new accept_filter_e enum
values in a couple of missed places in winnt_accept().

Submitted by: kotkov
Reviewed by: jailletc36, jim (via inspection), wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1840546 13f79535-47bb-0310-9956-ffa450edef68
      f62c6644
    • Stefan Eissing's avatar
      updated revisions merge in branch for tlsv1.3 support · ccd6af99
      Stefan Eissing authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1840531 13f79535-47bb-0310-9956-ffa450edef68
      ccd6af99
  3. 05 Sep, 2018 3 commits
  5. 04 Sep, 2018 3 commits
  7. 03 Sep, 2018 1 commit
  9. 31 Aug, 2018 3 commits
  11. 29 Aug, 2018 7 commits
  13. 28 Aug, 2018 6 commits
  15. 27 Aug, 2018 4 commits
  17. 26 Aug, 2018 2 commits
  19. 24 Aug, 2018 7 commits
  21. 22 Aug, 2018 1 commit