mod_proxy_fcgi.c

Checkout Tools
  • last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1661845 is being indexed.

Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),

r1643672, r1496178 from trunk

* Synch with trunk:

- Add missing APLOGNO.

- mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.

- Move two variable assignments off the fast path.

- Fix curly braces style. Remove useless empty lines

- tab vs space

- Removed tabs.

- dump fcgi headers with trace8 instead of debug+compile-time flag.

- Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4

Submitted by: jailletc36, ylavic, minfrin, fuankg, covener

Reviewed by: jailletc36, minfrin, ylavic

Backported by: jailletc36

  1. … 12 more files in changeset.
Fix typo already fixed in trunk (missing part of r1648557 ; the other fixes have been done in r1648559)
Merge r1647035 from trunk:

provide alternative PATH_INFO calculation options for proxy_fcgi.

PR 55329

  1. … 3 more files in changeset.
Merge the following revisions from trunk:

trunk patch: http://svn.apache.org/r1588544 (rewrite+UDS)

http://svn.apache.org/r1641636 ('using default worker' msg tweak)

http://svn.apache.org/r1647005 (tcp reuse)

http://svn.apache.org/r1647009 (uds reuse)

http://svn.apache.org/r1647334 (uds reuse fix)

+ 1 additional de_socketfy call in mod_proxy

  1. … 9 more files in changeset.
Merge r1646724, r1650309 from trunk:

tweak SCRIPT_FILENAME passed to fastcgi backends when a balancer is used.

save some bytes per Christophe's review.

  1. … 1 more file in changeset.
Merge r1640495, r1644031 from trunk

* mod_proxy_fcgi: Ignore body data from backend for 304 responses. PR 57198.

Submitted by: jkaluza

Reviewed by: jkaluza, ylavic, covener

Backported by: jailletc36

  1. … 2 more files in changeset.
Fix comment errors in mod_proxy_fcgi.
Merge r1640040, r1640042 from trunk:

mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error

when parsing or forwarding the response fails.

Follow up to r1640040: CHANGES entry.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1640036, r1640331 from trunk:

mod_proxy_fcgi: SECURITY: CVE-2014-3583 (cve.mitre.org)

Fix a potential crash with response headers' size above 8K.

The code changes to mod_authnz_fcgi keep the handle_headers()

function in sync between the two modules. mod_authnz_fcgi

does not have this issue because it allocated a separate byte

for terminating '\0'.

Submitted by: ylavic, trawick

Reviewed by: ylavic, trawick, mrumph

  1. … 3 more files in changeset.
Merge r1611978, r1612068 from trunk:

Add missing APLOGNO.

Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.

Add missing APLOGNO.

Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.

Split lines longer than 80.

Improve alignment.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 18 more files in changeset.
Merge r1618401 from trunk:

mod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the

application.

PR: 56858

Submitted by: Manuel Mausz <manuel-asf mausz.at>

Reviewed by: trawick

Submitted by: trawick

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1592037 from trunk:

mod_proxy_fcgi: Fix occasional high CPU when handling request bodies.

Submitted by: trawick

Reviewed by: covener, ylavic

  1. … 3 more files in changeset.
merge 1592032 from trunk:

mod_proxy_fcgi: better error messages, and fix an old bug where the error

condition was forgotten

Submitted by: trawick

Reviewed by: ylavic, covener

  1. … 2 more files in changeset.
Merge r1603027, r1603029, r1603122 from trunk:

Fix bug introduced in r1591508 which resulted in the final empty

FCGI_STDIN not being sent. Interaction with latest uWSGI (and

probably other protocol implementations) breaks without this.

Reindent after small fix in r1603027

mod_proxy_fcgi: follow up to r1592032.

Also break the outer loop when "sending stdin" fails.

Submitted by: trawick, ylavic

Reviewed/backported by: jim

  1. … 2 more files in changeset.
merge r1591508 from trunk:

mod_proxy_fcgi: Support iobuffersize parameter.

Submitted by: trawick

Reviewed by: jim, ylavic

  1. … 3 more files in changeset.
Merge r1591472 from trunk:

mod_proxy_fcgi: remove wasted memset() calls and other historical bits

Submitted by: trawick

Reviewed by: jim, ylavic

  1. … 2 more files in changeset.
Merge r1590437, r1592500 from trunk:

mod_proxy_fcgi: Don't segfault when failing to connect to the backend.

now understood why users haven't reported the segfault (yet) when mod_proxy_fcgi

can't connect to the application

Submitted by: trawick

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1585824 from trunk:

mod_proxy_fcgi: Fix sending of response without some HTTP headers

that might be set by filters.

The problem occurs when no body bytes were read while reading the

response headers, resulting in an empty brigade being sent down

the filter stack. One particualr filter that mishandles the empty

initial brigade is mod_deflate. It neglects to add to the response

header fields.

PR: 55558

Submitted by: Jim Riggs <jim riggs.me>

Reviewed by: trawick

Submitted by: trawick

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1542562 from trunk:

We were not being consistent between http and others

if we added the default port or not during the canonizing

phase... Baseline the http method (don't add unless the

port provided isn't the default).

Reviewed/backported by: jim

  1. … 12 more files in changeset.
Merge r1564756 from trunk:

mod_proxy_fcgi: Fix error message when an unexpected protocol version

number is received from the application.

PR: 56110

Submitted by: trawick

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1523281, r1524368, r1525276, r1525280, r1525281 from trunk:

Switch from private FastCGI protocol handling to util_fcgi API.

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Bring some envvar flexibility from mod_authnz_fcgi to mod_proxy_fcgi:

mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars.

An individual envvar with an encoded length of more than 16K will be

omitted.

Borrow a fix from mod_authnz_fcgi:

mod_proxy_fcgi: Handle reading protocol data that is split between

packets.

Use ap_log_rdata() to dump the FastCGI header, axing a bunch

of custom data dumping code.

Submitted by: trawick, jkaluza, trawick, trawick, trawick

Reviewed/backported by: jim

  1. … 9 more files in changeset.
  1. … 10 more files in changeset.
Merge r1311172, r1331243 from trunk:

If there is an error reading the headers from the backend,

send an error to the client

add PR reference

Submitted by: sf

Reviewed/backported by: jim

  1. … 1 more file in changeset.
Merge r1242351 from trunk:

Handle cases, esp when using mod_proxy_fcgi, when we do not

want SCRIPT_FILENAME to include the query string.

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.
Backport r1203859:

great proxy logging cleanup:

* remove "proxy:", "FCGI", etc. prefixes and pid which are now

included in the error log format

* propagate frontend request's logconfig to backend request

* use ap_log_rerror where possible

* remove obsolete APLOG_NOERRNO

  1. … 10 more files in changeset.