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

15848 Commits

Author SHA1 Message Date
Jim Jagielski
91f25252ce Backport of PID table code from trunk to 2.2...
Create a branch for this until we test enough to
fold into 2.2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-pid-table@546948 13f79535-47bb-0310-9956-ffa450edef68
2007-06-13 16:23:19 +00:00
Eric Covener
ebf474ed02 propose backport for PR 41551
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@543543 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 17:31:49 +00:00
Ruediger Pluem
a909e7efea * Cast a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@542933 13f79535-47bb-0310-9956-ffa450edef68
2007-05-30 21:05:31 +00:00
Nick Kew
c78a5d2afe Update bugfix proposal to incorporate rpluem's patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@541996 13f79535-47bb-0310-9956-ffa450edef68
2007-05-27 15:49:32 +00:00
Nick Kew
ae81b9a666 Propose backport of bugfix.
We can't go on with this unfixed - just look at the comments in Bugzilla!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@541928 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 19:00:10 +00:00
Jim Jagielski
eb2c9a2463 Add backport proposal: ProxyPassMatch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@541781 13f79535-47bb-0310-9956-ffa450edef68
2007-05-25 21:06:20 +00:00
Jean-Frederic Clere
030a1462f7 Cast my vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@540038 13f79535-47bb-0310-9956-ffa450edef68
2007-05-21 06:41:27 +00:00
Ruediger Pluem
ee426edf05 * Cast a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539626 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 23:18:17 +00:00
Justin Erenkrantz
e2f0a314f5 Propose two more mod_cache backports.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539622 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 22:45:10 +00:00
Ruediger Pluem
1060d64776 * Reset the votes and add a version of the patch that applies cleanly
to 2.2.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539434 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 12:48:56 +00:00
Jim Jagielski
297c7af35f Backport:
* mod_cache: Let Cache-Control max-age set the expiration date. 
        Trunk version of patch:
         http://svn.apache.org/viewvc?view=rev&revision=539063
        2.2.x version of patch:
         http://people.apache.org/~jerenkrantz/max-age-expire-2.2.x.patch
         (No ->minex in 2.2.x)
        +1: jerenkrantz, fielding, striker



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539430 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 12:41:14 +00:00
Jim Jagielski
a57f9ceb60 This has the votes...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539428 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 12:36:48 +00:00
Justin Erenkrantz
a8720a9ce3 Backport backlog cleared - except for one which doesn't apply cleanly any more.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539281 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 06:13:05 +00:00
Justin Erenkrantz
4f100a47d3 mod_cache: Allow caching of requests with query arguments when Cache-Control
max-age is explicitly specified.

(Backport of r538807)

Reviewed by: jerenkrantz, fielding, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539280 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 06:12:24 +00:00
Justin Erenkrantz
111f019f09 mod_disk_cache: Allow Vary'd content to be refreshed properly.
(Backport of r538992, r538997, r539054)

Reviewed by: jerenkrantz, fielding, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539279 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 06:09:53 +00:00
Justin Erenkrantz
8155b69e22 mod_proxy: Print the correct error message for erroneous configured ProxyPass
directives. PR 40439.

(Backport of r441947)

Reviewed by: rpluem, jim, jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539277 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 06:06:57 +00:00
Justin Erenkrantz
6b141a3d47 mod_so: Provide more helpful LoadModule feedback when an error occurs.
(Backport of r520733)

Reviewed by: wrowe, rpluem, niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539275 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 06:04:31 +00:00
Justin Erenkrantz
da10aa511c mod_alias: Accept path components (URL part) in Redirects. PR 35314.
(Backport of r490142)

Reviewed by: niq, jim, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539273 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 06:00:10 +00:00
Justin Erenkrantz
ee2d2fece0 mod_headers: Allow % at the end of a Header value. PR 36609.
(Backport of r490156, r499567)

Reviewed by: niq, rpluem, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539271 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 05:57:45 +00:00
Sander Striker
8b8fb1cdd7 * STATUS
Vote on a backport.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539185 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 00:08:55 +00:00
Justin Erenkrantz
5f777d9d7c Vote on a backport.
Move two that are approved to the right section. (rpluem and fielding both
posted on dev@httpd that they are okay with trunk version going in instead.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539161 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 23:14:49 +00:00
Roy T. Fielding
26e5e431b6 8 of 10 on the fugly scale
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539155 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 23:03:52 +00:00
Ruediger Pluem
f7c15b9c88 * Vote, promote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539117 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 21:13:30 +00:00
Ruediger Pluem
f0db3df984 Merge r506621 from trunk:
* Save the key we generate during our first run of cache_generate_key_default
  on each request in the request_config. During consecutive runs of
  cache_generate_key_default during processing the request we restore it
  from there as we might not be able to generate the same key again as
  the ingredients used to compose the key might have changed and we constantly
  must use a key that could be generated during the quick handler phase.

PR: 41475

Submitted by: rpluem
Reviewed by: rpluem, jerenkrantz, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539112 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 21:03:04 +00:00
Ruediger Pluem
3fd2406cd0 Merge r504183 from trunk:
* Add CacheIgnoreQueryString directive to cache requests with a query string
  even if no expiration time is specified. Futhermore the query string will not
  be used for key generation such that requests to the same URI path, but with
  different query strings are mapped to the same cache entity. Turning this
  setting to ON violates RFC 2616/13.9 and thus it is turned off by default.

PR: 41484
Submitted by: Fredrik Widlund <fredrik.widlund qbrick.com>
Reviewed by: rpluem, jerenkrantz, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539111 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 20:57:17 +00:00
Roy T. Fielding
4aee2e0b74 easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539083 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 19:10:14 +00:00
Justin Erenkrantz
3eb7006ed7 I have lots of love for mod_cache and I want to share it with the world!
(Propose another mod_cache-related backport)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539072 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 18:32:12 +00:00
Justin Erenkrantz
96d4e38ec6 Bundle in r539054 as well to this backport proposal collection.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539057 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 18:18:33 +00:00
Jim Jagielski
772157387f And promote... Will likely apply 1st round of
approved patches later on today :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539006 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 16:41:27 +00:00
Jim Jagielski
38f655db12 Cast 2 votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539005 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 16:40:29 +00:00
Justin Erenkrantz
4945acb1bf Reply to rpluem and propose another round of cache fixes for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539000 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 16:24:32 +00:00
Jim Jagielski
b9b8dcae8a Low hanging fruit...
I'm looking at the varios cache patches today and
will likely vote them later on.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@538894 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 12:49:32 +00:00
Ruediger Pluem
05b665bd8b Merge r425787 from trunk:
* Remove all filters that are before the cache_out filter. This ensures
  that we kick off the filter stack with our cache_out filter being the
  first in the chain. This make sense because we want to restore things
  in the same manner as we saved them.
  There may be filters before our cache_out filter, because

  1. We call ap_set_content_type during cache_select. This causes
     Content-Type specific filters to be added.
  2. We call the insert_filter hook. This causes filters e.g. like
     the ones set with SetOutputFilter to be added.

PR: 40090

Submitted by: rpluem
Reviewed by: rpluem, wrowe, jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@538868 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 10:55:15 +00:00
Ruediger Pluem
756744daed * Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@538863 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 10:14:11 +00:00
Justin Erenkrantz
d2bfa61f38 Give mod_cache some more lovin': cast some votes and propose a backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@538809 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 05:51:14 +00:00
Ruediger Pluem
282ef6c1bc * Add comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@538692 13f79535-47bb-0310-9956-ffa450edef68
2007-05-16 19:15:04 +00:00
Sander Temme
6dfee30f78 I think I found the PKCS#7 patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@538439 13f79535-47bb-0310-9956-ffa450edef68
2007-05-16 05:41:22 +00:00
Chris Darroch
5d1cab9489 added proposals for backporting patches for PRs 39985 and 41302,
and various prerequisite patches


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@538407 13f79535-47bb-0310-9956-ffa450edef68
2007-05-16 02:21:08 +00:00
Chris Darroch
041b54abc0 vote and explanation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536989 13f79535-47bb-0310-9956-ffa450edef68
2007-05-10 20:35:27 +00:00
Ruediger Pluem
2768ced15b * Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536986 13f79535-47bb-0310-9956-ffa450edef68
2007-05-10 20:16:42 +00:00
Nick Kew
0f3817d4f7 Roll up patches and attach to bug so there's a URL to point to
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536831 13f79535-47bb-0310-9956-ffa450edef68
2007-05-10 11:30:31 +00:00
Nick Kew
a5609c8413 Propose trivial bugfix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536821 13f79535-47bb-0310-9956-ffa450edef68
2007-05-10 10:58:31 +00:00
Ruediger Pluem
73f1d19b14 * This proposal resurrected in r536002. It was already backported in r535903.
So remove it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536631 13f79535-47bb-0310-9956-ffa450edef68
2007-05-09 19:52:47 +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
Nick Kew
8707cbf078 vote&promote low-hanging fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536348 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 22:01:16 +00:00
Ruediger Pluem
79dd4cc374 * Cast a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536329 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 21:09:03 +00:00
Ruediger Pluem
dbeee72670 * Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536327 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 20:56:19 +00:00
William A. Rowe Jr
ca2999f229 new suggestion, make mod_so more informative
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536307 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 19:25:53 +00:00
Jim Jagielski
519fedd812 Merge r473278 from trunk:
Add alternate is_socket_connected by using APR functions.
Submitted by: mturk
Reviewed by: jim


Merge r535354 from trunk:

Abstract out (kinda) MSG_PEEK. This way when we
actually update APR and apr_socket_recvfrom()
to know about APR_MSG_OOB, APR_MSG_PEEK, etc...
this code won't need to be adjusted. Also,
make nicer for 2.2 backport.


Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536291 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 18:25:52 +00:00
Jim Jagielski
841a5d56cf Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536289 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 18:22:09 +00:00