www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
25,891 Commits 62 Branches 306 Tags
e19c8aabd431cdb57d2efda49da99bb4bddee104
Commit Graph

1664 Commits

Author SHA1 Message Date
Christophe Jaillet
e2643b38f9 Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578760 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-18 06:52:08 +00:00
Christophe Jaillet
845a77beca Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578759 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-18 06:51:49 +00:00
Jeff Trawick
d50ebf12a6 fix spelling 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575958 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-10 14:57:14 +00:00
Jim Jagielski
cd304f4964 Allow reverse-proxy to be set via explicit handler 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1573626 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 17:28:17 +00:00
Yann Ylavic
1e9f5c99cf mod_proxy: Add comment and avoid ternary operator as condition (no functional change). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1573229 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-01 21:36:27 +00:00
Yann Ylavic
d29ce4b047 mod_proxy: follows up r1572630. 
Don't reuse a SSL backend connection with no SNI for a request requiring SNI.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572967 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 14:46:50 +00:00
Yann Ylavic
fb3ff3e754 Redo what was reverted in r1572627. 
Don't reuse a SSL backend connection whose SNI differs. PR 55782.
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572630 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 15:40:01 +00:00
Yann Ylavic
0ab0ee5043 Move newly added proxy_conn_rec's uds_path field to the end of the struct like in 2.4.x. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572628 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 15:33:58 +00:00
Yann Ylavic
dc560db2e9 Revert r1572606 for the time being since backport would conflict with 2.4.x's proxy_conn_rec. 
The uds_path field is at the end of the struct in 2.4.x but not in trunk.
Fix that first, then recommit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572627 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 15:31:58 +00:00
Yann Ylavic
93a607e6f2 Don't reuse a SSL backend connection whose SNI differs. PR 55782. 
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572606 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 14:52:12 +00:00
Yann Ylavic
739dc00ca9 Avoid useless functions calls. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572561 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 13:39:25 +00:00
Yann Ylavic
42b77650ae Cleanup the client to backend brigade before returning an error (if any) to avoid buckets lifetime issues (backend connection's pool destroyed before request's one). PR 50335. 
Suggested by rpluem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572543 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 13:05:24 +00:00
Yann Ylavic
accfcf7471 Log an error in mod_proxy_http when reading the request body fails. 
Follow-up to r1538776 where incomplete bodies are detected and an error returned through the input filters.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1570598 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 15:08:32 +00:00
Eric Covener
33f7dbafce handle POLLERR/POLLHUP during poll() to avoid high CPU busy loop. 
Submitted By: Joffroy Christen <joffroy.christen solvaxis com>, Eric Covener]
Committed By: covener
 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1569615 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 02:42:29 +00:00
Yann Ylavic
ffdab778e2 mod_proxy_http: don't recycle backend connections known to be closed (eg. EOS by close). 
This saves a useless ap_is_socket_connected() call when reused.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1568404 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 17:55:19 +00:00
Jeff Trawick
304da56908 mod_proxy_fcgi: Fix error message when an unexpected protocol version 
number is received from the application.

PR: 56110


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564756 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-05 12:58:11 +00:00
Ruediger Pluem
82bb21ba2e * Do not parse URL in case of regular expression as they likely do not follow 
the URL syntax.

PR: 56074


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564437 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-04 19:36:50 +00:00
Jim Jagielski
c9acc73574 r->filename should maintain the proxy: prefix for PHP-FPM 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561660 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-27 13:09:11 +00:00
Jim Jagielski
ee7cbbac67 handle leak. thx to Y^2 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561137 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-24 20:01:47 +00:00
Jim Jagielski
0662e2e64d Reflow logic... pull UDS stuff out 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560979 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-24 13:06:40 +00:00
Jim Jagielski
e614823e31 Tuck away UDS path in request-rec, since worker isn't 
thread-safe. Protect from NULL refs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560689 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-23 14:09:40 +00:00
Jim Jagielski
7651045da6 Adjust url as required, following what we did to r->filename. 
Save some cycles when searching...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560546 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 22:26:49 +00:00
Jim Jagielski
72df6b36bf make mod_rewrite and mod_proxy UDS work together... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560367 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 14:54:21 +00:00
Jan Kaluža
7d473bfd8f mod_proxy_ajp: remove AJP_EBAD_METHOD, it is not used since r1435178 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560269 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 07:40:28 +00:00
Christophe Jaillet
60c47567e5 Oops (fix r1556912) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1556937 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-09 20:19:51 +00:00
Christophe Jaillet
c98522ed33 Add missing break. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1556912 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-09 18:45:34 +00:00
Graham Leggett
4fecd089c4 Add a "MATCH_" prefix to variables set within 
LocationMatch/DirectoryMatch/FilesMatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1555266 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-03 22:26:55 +00:00
Eric Covener
758cf25ed9 c89 fix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554994 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-03 01:54:28 +00:00
Graham Leggett
43e022f007 core: Support named groups and backreferences within the LocationMatch, 
DirectoryMatch, FilesMatch and ProxyMatch directives.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554300 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-30 19:50:52 +00:00
Guenter Knauf
546919ab16 Added missing proxy export symbols. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554179 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-30 10:37:40 +00:00
Christophe Jaillet
d7dd87bf21 Remove <Proxy ~ wildcard-url> syntax which: 
- is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552227 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-19 04:53:15 +00:00
Christophe Jaillet
ac4f08f0f6 Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead. 
Save 8k of stack by the same time.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551714 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-17 21:18:04 +00:00
Jan Kaluža
d9c2352952 Cleanup the bb brigade, because buckets inserted to it can be created from 
scpool and this pool can be freed before this brigade.
POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded servers,
e.g. PR 50335.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550061 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-11 07:27:12 +00:00
Christophe Jaillet
a95a9fc800 Use apr_pstrmemdup instead of apr_pstrndup when this is safe. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1549676 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-09 20:52:26 +00:00
Jeff Trawick
269ec5b00f no more fcgi_protocol.h 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1544381 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-22 00:18:24 +00:00
Jim Jagielski
0315a2d929 Correct logic... if this is a UDS socket, then bypass all 
this.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1543174 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-18 21:37:05 +00:00
Jim Jagielski
bb76893cfb 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).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542562 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 20:13:48 +00:00
Jim Jagielski
61a09af7dc Expand some of these fields... mostlt it's the workers that we 
need to expand due to them mapping to actual hostnames

NOTE: 96 enough?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540318 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-09 14:49:25 +00:00
Jim Jagielski
7634e2e342 UDS urls need to be desockified when configuring... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540052 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-08 14:30:12 +00:00
Joe Orton
817b1ea2c0 * modules/proxy/mod_proxy_http.c (ap_proxy_http_request): Use the same 
brigade lifetime for the header brigade as the other brigades.
  POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded
  servers, e.g. PR 50335; appears correct or at least not harmful.

PR: 50335


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534321 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-21 18:58:26 +00:00
Ruediger Pluem
69bc7d594e * Fix logical flaw introduced in r1531340. We checked for the opposite. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533444 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 13:30:52 +00:00
Jim Jagielski
d897f098f9 Rüdiger and Yann suggestions 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533440 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 13:10:45 +00:00
Jim Jagielski
c418702714 another suggestion by Yann... use a shorter lifetime pool 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533272 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 22:04:31 +00:00
Jim Jagielski
b71b312095 typo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533170 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 17:21:37 +00:00
Jim Jagielski
0b4520d54c from an idea by Yann Ylavic <ylavic.dev@gmail.com> 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533169 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 17:21:04 +00:00
Jim Jagielski
27b314b4e6 move pool creation to the single instance when we need it... 
but be pool aware anyway, just in case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533153 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 16:52:04 +00:00
Jim Jagielski
d152f386a0 Only assume localhost in the special case where the person 
just has the lone scheme after the |

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533113 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 15:24:44 +00:00
Jim Jagielski
81e827c11c ap_proxy_strncpy should correctly handle src being NULL. 
Actually, apr_cpystrn() should as well...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533100 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 15:02:04 +00:00
Jim Jagielski
347c75b3c5 Put the uds path in its own field, and adjust the logic 
to look for an empty string rather than a flag.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533087 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 14:10:43 +00:00
Jim Jagielski
43fb7fa32f Eclipse code analysis warning 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533065 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 12:53:53 +00:00