1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

1092 Commits

Author SHA1 Message Date
Nick Kew
37d373a8f1 Backport r730296: fix for HTML entity escaping in mod_include,
including enhancement of ap_escape_html API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@732583 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 01:24:16 +00:00
Roy T. Fielding
7a4b1a096a happy new year
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@731767 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 23:37:11 +00:00
Ruediger Pluem
868f35de47 We are at 2.2.12-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@723998 13f79535-47bb-0310-9956-ffa450edef68
2008-12-06 15:14:08 +00:00
Ruediger Pluem
1d5fe2c139 Get ready to tag as 2.2.11
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@723996 13f79535-47bb-0310-9956-ffa450edef68
2008-12-06 15:11:00 +00:00
Ruediger Pluem
dfc6d1ce23 Merge r704726, r704845 from trunk:
Export and install the mod_rewrite.h header to ensure the optional
rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are
available to third party modules.

Minor bump when exporting mod_rewrite.h

Reviewed by: minfrin, niq, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@720590 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 20:24:49 +00:00
Jim Jagielski
a10438c040 *) mod_proxy: Prevent segmentation faults by correctly adjusting the lifetime
of the buckets read from the proxy backend. PR 45792 [Ruediger Pluem]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@713146 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 20:04:34 +00:00
Jim Jagielski
3bf0124dd3 * mod_proxy: Add the possibility to set the worker parameters
connectiontimeout and ping in milliseconds. 
     Trunk version of patch:
       http://svn.apache.org/viewvc?rev=705005&view=rev
       http://svn.apache.org/viewvc?rev=707022&view=rev
     Backport version for 2.2.x of patch:
       http://people.apache.org/~rpluem/patches/milli_seconds.diff
     +1: rpluem, pgollucci, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@713145 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 20:01:59 +00:00
Ruediger Pluem
d948b3f39b * Whitespace fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@712831 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 21:01:10 +00:00
Jim Jagielski
e7c0147e1b We are at 2.2.11-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@702517 13f79535-47bb-0310-9956-ffa450edef68
2008-10-07 15:24:39 +00:00
Jim Jagielski
44357d6230 Get ready to tag as 2.2.10
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@702514 13f79535-47bb-0310-9956-ffa450edef68
2008-10-07 15:20:24 +00:00
Jim Jagielski
1a0876a9ba comment docco reformat
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696759 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 18:43:22 +00:00
Jim Jagielski
a19c7578e4 Merge r611483, r639005, r639010 from trunk:
Support chroot on unix-family platforms
PR 43596 (Dimitar Pashev)


Document new ChrootDir directive (r611483)


mmn bump for chroot (r611483)

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696758 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 18:42:18 +00:00
Jim Jagielski
de3d2ba1cf * mod_proxy_balancer: Allow for treatment of ';' char as a session
deliminator/separator, ala mod_jk.
       PR: 45158
           Trunk version of patch:
                  http://svn.apache.org/viewvc?rev=686809&view=rev
                         http://svn.apache.org/viewvc?rev=687754&view=rev
                             Backport version for 2.2.x of patch:
                                    http://people.apache.org/~jim/patches/scolon-proxy.patch.txt
                                        +1: jim, rpluem, jerenkrantz




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696319 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 14:29:14 +00:00
Jim Jagielski
97c70b20f2 * mod_proxy: Add the possibility to set a separate connection timeout for
backend workers.
       PR: 45445
           Trunk version of patch:
                  http://svn.apache.org/viewvc?rev=684341&view=rev
                      Backport version for 2.2.x of patch:
                             Trunk version of patch works, but 
                                    http://people.apache.org/~rpluem/patches/37770_2.2.x.diff
                                           fixes a conflict regarding the needed minor bump.
                                               +1: rpluem, jim, jerenkrantz



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696316 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 14:23:35 +00:00
Jim Jagielski
f7ae26bcd7 We are now 2.2.10-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@666275 13f79535-47bb-0310-9956-ffa450edef68
2008-06-10 18:50:09 +00:00
Jim Jagielski
fdc64f53c1 Get ready to tag 2.2.9
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@666272 13f79535-47bb-0310-9956-ffa450edef68
2008-06-10 18:48:43 +00:00
Nick Kew
299881961d Introduce variable interpolation in reverse proxy configuration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661087 13f79535-47bb-0310-9956-ffa450edef68
2008-05-28 21:11:24 +00:00
Eric Covener
5636d8eb11 Merge r659560, r660485 from trunk:
The response to the TRACE method is partially garbled on an EBCDIC platform.
Send the request line and trailing CRLF in ASCII.

Submitted by:           David Jones <oscaremma gmail.com>
Reviewed and tested by: gregames



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660728 13f79535-47bb-0310-9956-ffa450edef68
2008-05-27 21:43:39 +00:00
Ruediger Pluem
6c10c6b8b5 * Merge r602542, r603237, r603502, r603543, r604447, r604449, r605314,
r605838 from trunk:

* Enable the proxy to keep connections persistent in the HTTPS case.

  Basicly the persistence is created by keeping the conn_rec structure
  created for our backend connection (whether http or https) in the connection
  pool. This required to adjust scoreboard.c in a way that its functions can
  properly deal with a NULL scoreboard handle by ignoring the call or returning
  an error code.

* Use a separate subpool to manage the data for the socket and the connection
  member of the proxy_conn_rec struct as we destroy this data more frequently
  than other data in the proxy_conn_rec struct like hostname and addr (at least
  in the case where we have keepalive connections that timed out and were
  closed by the backend).
  This fixes a memory leak with short lived and broken connections.

* Fix another memory leak related to PR 44026. Now that we keep the connection
  data structure alive in the reslist, the live time of c->pool is too long.
  r->pool has the correct live time since rp dies before r.

* Do not register connection_cleanup as cleanup for the conn->pool. In the past
  it was needed to register connection_cleanup as a cleanup for the frontend
  connection memory pool (c->pool) to ensure that connection returns into the
  connection pool if the memory pool of the frontend connection memory pool
  gets destroyed / cleared. Now we ensure explicitly the connection returns
  to the connection pool once we finished handling the request.

* Tag the pools appropriately to ease memory debugging.

* Only sent a flush bucket down the chain if buckets where sent down the chain
  before that could still be buffered in the network filter. This is the case
  if we have sent an EOS bucket or if we actually sent buckets with
  data down the chain. In all other cases we either have not sent any
  buckets at all down the chain or we only sent meta buckets that are
  not EOS buckets down the chain. The only meta bucket that remains in
  this case is the flush bucket which would have removed all possibly
  buffered buckets in the network filter.
  If we sent a flush bucket in the case where not ANY buckets were
  sent down the chain, we break error handling which happens AFTER us.

* Using the reslist pool for the proxy_conn_rec structure introduces a memory
  leak when connections get created and destroyed frequently by the reslist
  (e.g.  destroying idle elements of the reslist). So use the subpool
  dedicated for the proxy_conn_rec structure to allocate the memory for the
  structure itself.

PR: 44026, 44543
Submitted by: rpluem
Reviewed by: jim, rpluem, fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@657440 13f79535-47bb-0310-9956-ffa450edef68
2008-05-17 19:42:03 +00:00
Jim Jagielski
3d685b82b3 * mod_proxy: Add in 'disablereuse' option for parity with similar
mod_jk functionality.
      http://svn.apache.org/viewvc?view=rev&revision=627728



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@655998 13f79535-47bb-0310-9956-ffa450edef68
2008-05-13 20:32:39 +00:00
Jim Jagielski
047918ac48 * mod_logio: Provide optional function to allow modules to adjust the
bytes_in count 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@631359 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 19:47:51 +00:00
Jim Jagielski
5025fe9de7 We are now 2.2.9-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@610842 13f79535-47bb-0310-9956-ffa450edef68
2008-01-10 16:40:10 +00:00
Jim Jagielski
1b38e24335 get ready to tag 2.2.8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@610840 13f79535-47bb-0310-9956-ffa450edef68
2008-01-10 16:37:45 +00:00
Jim Jagielski
d98ec2b509 Adjust for 2008
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@610820 13f79535-47bb-0310-9956-ffa450edef68
2008-01-10 15:53:06 +00:00
Jim Jagielski
ae8f405183 And we are now 2.2.8-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608858 13f79535-47bb-0310-9956-ffa450edef68
2008-01-04 14:33:07 +00:00
Jim Jagielski
a601c439a4 Ready for tagging 2.2.7
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608850 13f79535-47bb-0310-9956-ffa450edef68
2008-01-04 14:26:19 +00:00
Jim Jagielski
71dab7bf45 Add ProxyFtpDirCharset directive:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608191 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 19:25:08 +00:00
Eric Covener
16be70046f backport r607766, r607841 from trunk for PR 39095
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607929 13f79535-47bb-0310-9956-ffa450edef68
2008-01-01 22:29:45 +00:00
Ruediger Pluem
7e459a0fea Merge 590641 from trunk:
Add in SeeRequestTail directive, to handle the shortcoming
of only storing 63 bytes of the request, when the requests
are longer than that and only vary towards the end; eg:

   GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/apples.jpg
   GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/pears.jpg
   GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/plums.jpg

Submitted by: jim
Reviewed by: jim, rpluem, niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602508 13f79535-47bb-0310-9956-ffa450edef68
2007-12-08 16:59:08 +00:00
Jim Jagielski
d4283ac1cf * mod_proxy_http: Correctly forward unexpected interim (HTTP 1xx) responses
incorporating ap_send_interim_response core API
          PR 16518



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602468 13f79535-47bb-0310-9956-ffa450edef68
2007-12-08 14:01:47 +00:00
Jim Jagielski
296439bfa9 mod_proxy canon-tion improvements/fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@596712 13f79535-47bb-0310-9956-ffa450edef68
2007-11-20 15:11:39 +00:00
Jim Jagielski
3813732dbc Apply backport... fix "conflicts" with CHANGES and ap_mmn.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@595474 13f79535-47bb-0310-9956-ffa450edef68
2007-11-15 22:08:30 +00:00
Jim Jagielski
c1013685e8 Merge r579991, r580502, r584842 from trunk:
Add "DefaultType None" option
PR 13986 and PR 16139


Document "DefaultType None" option (PR 13986)


Improve documentation of "DefaultType None"

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@589616 13f79535-47bb-0310-9956-ffa450edef68
2007-10-29 13:11:42 +00:00
Jim Jagielski
831e1662ff Merge r451575, r451582 from trunk:
Enable retry=0 for the worker.
This allows to have an option to always retry
the workers in error state instead using a
specified time.

Move new struct member to the end of the struct,
so we can keep the compatibility.
Submitted by: mturk
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@576910 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 13:32:28 +00:00
Jim Jagielski
7a2904c9b7 And bump after tagging 2.2.6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@572803 13f79535-47bb-0310-9956-ffa450edef68
2007-09-04 20:00:49 +00:00
Jim Jagielski
b53b161467 Get ready to tag 2.2.6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@572799 13f79535-47bb-0310-9956-ffa450edef68
2007-09-04 19:58:14 +00:00
Nick Kew
da6022b8ea Update copyright dates from 2006 to 2007
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@571768 13f79535-47bb-0310-9956-ffa450edef68
2007-09-01 11:51:42 +00:00
Jim Jagielski
889a4ee357 And bump after tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@564747 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 20:18:00 +00:00
Jim Jagielski
24d185d12c Prepare for tagging 2.2.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@564745 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 20:16:03 +00:00
Joe Orton
e56a5ff187 Merge r551843, r551889 from trunk:
Add alternative fixes for CVE-2007-3304:

* configure.in: Check for getpgid.

* include/mpm_common.h (ap_mpm_safe_kill): New prototype.

* server/mpm_common.c (reclaim_one_pid): Ensure pid validity before
calling apr_proc_wait().
(ap_mpm_safe_kill): New function.

* server/mpm/prefork/prefork.c, server/mpm/worker/worker.c,
server/mpm/experimental/event/event.c: Use ap_mpm_safe_kill() on pids
from the scoreboard, throughout.

* include/ap_mmn.h: Minor bump.

* server/mpm_common.c: getpgid() returns a pid_t

Submitted by: jorton, jim
Reviewed by: jorton, jim, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@556936 13f79535-47bb-0310-9956-ffa450edef68
2007-07-17 14:48:25 +00:00
Ruediger Pluem
a1c3be66f2 Merge r535169 from trunk:
* Add extern "C" linkage to several headers to make it easier to use
  them in C++ code.

PR: 42286
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem, wrowe, niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536627 13f79535-47bb-0310-9956-ffa450edef68
2007-05-09 19:35:45 +00:00
William A. Rowe Jr
62101123b6 Bump after tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493426 13f79535-47bb-0310-9956-ffa450edef68
2007-01-06 06:32:08 +00:00
William A. Rowe Jr
8482ceb536 Prepare for tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493424 13f79535-47bb-0310-9956-ffa450edef68
2007-01-06 06:29:51 +00:00
Jim Jagielski
da84fe8fd9 Delete mistakenly added files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484631 13f79535-47bb-0310-9956-ffa450edef68
2006-12-08 15:09:43 +00:00
Jim Jagielski
ef474b032f Merge r442758 from trunk:
PR 31759 (mutated) - reported by Jo Rhett
Don't return apr_status_t error value from input filter chain.

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483980 13f79535-47bb-0310-9956-ffa450edef68
2006-12-08 13:07:14 +00:00
Graham Leggett
957841ebee core: Deal with the widespread use of apr_status_t return values
as HTTP status codes, as documented in PR#31759 (a bug shared by
the default handler, mod_cgi, mod_cgid, mod_proxy, and probably
others).

+1: niq, minfrin, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@463488 13f79535-47bb-0310-9956-ffa450edef68
2006-10-12 22:55:03 +00:00
Jeff Trawick
492e695c40 merge from trunk (but preserve ap_get_server_version()):
*) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now 
     deprecated, and is replaced by ap_get_server_banner() and 
     ap_get_server_description().

Reviewed by: rpluem, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68
2006-09-15 13:19:25 +00:00
William A. Rowe Jr
cc786a1ccb Bump after tag 2.2.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426152 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 17:21:39 +00:00
William A. Rowe Jr
9e1fa0c9f3 Prepare to tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426150 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 17:16:46 +00:00
Ruediger Pluem
855ef76388 Merge r399947, r406697 from trunk:
* Add optional 'scheme://' prefix to ServerName directive.  For
  'https', mod_http returns "https" for the ap_hook_http_scheme and
  DEFAULT_HTTPS_PORT for ap_hook_default_port.  This fixes Redirect
  responses to requests for directories without a trailing slash
  when httpd runs behind a proxy or offload device that processes
  SSL.  It also enables support for Subversion in that
  configuration.  This change is completely backwards compatible
  and passes the perl-framework.  Minor mmn bump because I add a
  field to server_rec.

* Document r399947, addition of optional scheme:// to ServerName directive

PR: 33398
Submitted by: sctemme
Reviewed by: sctemme, rpluem, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425051 13f79535-47bb-0310-9956-ffa450edef68
2006-07-24 13:34:19 +00:00