]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1741310, r1741461 from trunk:
authorRuediger Pluem <rpluem@apache.org>
Tue, 3 May 2016 18:57:04 +0000 (18:57 +0000)
committerRuediger Pluem <rpluem@apache.org>
Tue, 3 May 2016 18:57:04 +0000 (18:57 +0000)
commit231ce5ad60c9b398db163243ac089fd191dfe030
treede49d0485e722e388c87bf078e0e99cd8a4841e9
parent2b68525e218706bbc7a028022fdc775c81de3d27
Merge r1741310, r1741461 from trunk:

  Ensure http2 follows http in the meaning of
  status WRITE (meaning 'in the request processing
  phase' even if still consuming the request body,
  not literally in a 'now writing' state).

  Ensure a number of MPMs and the h2 connection io
  no longer clobber the request status line during
  state-only changes.  While at it, clean up some
  very ugly formatting and unnecessary decoration,
  and avoid the wordy _from_conn() flavor when we
  are not passing a connection_rec.

  Ensure the useragent_ip is only used in the case
  where it has been initialized, fall back on the
  connection's remote_ip if the status is accidently
  updated from an uninitialized request_rec.

Revert to 2.4.1 behavior and null the request and vhost as appropriate.
PR: 59333
Submitted by: wrowe
Reviewed by: wrowe, ylavic, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1742179 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/http2/h2_conn_io.c
modules/http2/h2_task.c
server/core.c
server/mpm/event/event.c
server/mpm/winnt/child.c
server/mpm/worker/worker.c
server/scoreboard.c