Skip to content
GitLab
  1. 20 Feb, 2018 10 commits
    • Yann Ylavic's avatar
      Merge r1824811 from trunk: · 39ae6cd6
      Yann Ylavic authored 
      10 years after r567503 , fix this properly.

The lock is created in post_config, so we can't copy it
around in a merge_server_config() callback.


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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824872 13f79535-47bb-0310-9956-ffa450edef68
      39ae6cd6
    • Stefan Eissing's avatar
      On the 2.4.x branch: · 6bc8b322
      Stefan Eissing authored 
      Merged r1820464 from trunk.

elukey: mod_md update to current certifcate agreement URL.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824871 13f79535-47bb-0310-9956-ffa450edef68
      6bc8b322
    • Yann Ylavic's avatar
      Backported in r1824868. · fd7f8b35
      Yann Ylavic authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824869 13f79535-47bb-0310-9956-ffa450edef68
      fd7f8b35
    • Yann Ylavic's avatar
      Merge r1823047, r1824454, r1824463, r1824464, r1824497, r1824862 from trunk: · 566b629a
      Yann Ylavic authored 
      mpm_event: move lingering close "sucker" from the listener to worker(s).

This was the last non-constant time action performed by the listener thread.

It's now handled by the worker thread directly after entering lingering close,
which should directly address the cases when the socket is already closed
remotely at that time, hence avoid more scheduling (it may be the common case
for some scenarios).

And it's only if the above would need blocking (i.e. more data to suck) that
the socket is added to the pollset for the listener to re-schedule a worker
later when ready. If no worker is available at that time then the socket is
forcibly closed (similarly to what's done for keepalive connections in this
case).

Also, since process_lingering_close() is now called by a worker thread and
with almost no depth in the call stack, we can grow the size of the "suck"
buffer from 2K to 32K to potentially call recv() up to sixteen times less.


mpm_event: follow up to r1823047.

Update clogged counter on read_request retry too.


mpm_event: follow up to r1823047: simplify "clogging" logic (reentrance).


mpm_event: follow up to r1823047: complete state validation after processing.


mpm_event: follow up to r1823047: CHANGES entry.


mpm_event: follow up to r1823047 and r1824464.

MMN bump for CONN_STATE_NUM, plus don't consider CONN_STATE_LINGER_* as valid
states returned process_connection (never have been).


Submitted by: ylavic
Reviewed by: ylavic, minfrin, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824868 13f79535-47bb-0310-9956-ffa450edef68
      566b629a
    • Yann Ylavic's avatar
      Backported in r1824866. · df45c19e
      Yann Ylavic authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824867 13f79535-47bb-0310-9956-ffa450edef68
      df45c19e
    • Yann Ylavic's avatar
      Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635,... · 1f6ed3d6
      Yann Ylavic authored 
      Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639, r1821644, r1821647, r1821648, r1821649, r1821650, r1821651, r1821659, r1821660, r1822366, r1822367, r1824381 from trunk:

Shared fdqueue code between MPMs event and worker into mpm_fdqueue.

This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.


mpm_fdqueue: follow up to r1821624.

And now it's mpm_fdqueue, with minimal #includes.


mpm_fdqueue: follow up to r1821624.

Opacify fdqueue types.


mpm_fdqueue: follow up to r1821624.

Style, no functional change.


mpm_fdqueue: follow up to r1821624.

Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().


mpm_fdqueue: follow up to r1821624.

Clear recycled_pools_count in ap_free_idle_pools().


mpm_fdqueue: follow up to r1821624.

Prepare mpm_worker to use common fdqueue.


mpm_worker: follow up to r1821624.

Use common [mpm_]fdqueue.


mpm_fdqueue: follow up to r1821624.

The implemention wants APR_HAS_THREADS too.


mpm_fdqueue: follow up to r1821624.

The code is not part of the API.


mpm_fdqueue: follow up to r1821624.

Fix typo in comment.


mpm_fdqueue: follow up to r1821624.

Cosmetics, 80 cols, no functional change.


mpm_worker: follow up to r1821624.

Free idle pools while stopping.


mpm_fdqueue: follow up to r1821624.

Be explicit in the naming about what's push/pop-ed.


mpm_fdqueue: follow up to r1821624.

Either error matters, simplify code.


mpm_fdqueue: follow up to r1821624.

Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().


mpm_fdqueue: follow up to r1821624.

Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).


mpm_fdqueue: follow up to r1821624.

80 colums.


Follow up to r1821624: CHANGES entry.


Submitted by: ylavic
Reviewed by: ylavic, minfrin, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824866 13f79535-47bb-0310-9956-ffa450edef68
      1f6ed3d6
    • Yann Ylavic's avatar
      Follow up to r1821624: sync with latest 2.4.x. · c135d9f0
      Yann Ylavic authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@1824864 13f79535-47bb-0310-9956-ffa450edef68
      c135d9f0
    • Yann Ylavic's avatar
      Promote. · ca190395
      Yann Ylavic authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824863 13f79535-47bb-0310-9956-ffa450edef68
      ca190395
    • Jim Jagielski's avatar
      Backport vote · c1fb4ed8
      Jim Jagielski authored 
      
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824858 13f79535-47bb-0310-9956-ffa450edef68
      c1fb4ed8
    • Ruediger Pluem's avatar
      * Vote · c3ef7df4
      Ruediger Pluem authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824833 13f79535-47bb-0310-9956-ffa450edef68
      c3ef7df4
  3. 19 Feb, 2018 10 commits
  5. 18 Feb, 2018 1 commit
  7. 17 Feb, 2018 4 commits
  9. 16 Feb, 2018 15 commits