www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
17,629 Commits 62 Branches 313 Tags
httpd-2.2-proxy
Commit Graph

17629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Jagielski
1a216eca67 More trunk backporting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@809545 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-31 11:41:33 +00:00
Jim Jagielski
fdbbba3802 Unused 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@774773 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-14 14:13:06 +00:00
Jim Jagielski
94a600cfbf minor clean 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@774429 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 16:56:50 +00:00
Jim Jagielski
8add30621f Sync up with trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@774427 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 16:55:06 +00:00
Jim Jagielski
a13b94e430 And un-module the files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772335 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 16:01:37 +00:00
Jim Jagielski
666508d21d Move away from sub-modules 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772334 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 16:00:22 +00:00
Jim Jagielski
0829152d5d Autogen'ed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772331 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 15:56:31 +00:00
Jim Jagielski
eced674f69 Remove some -trunk foo-nis 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772290 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 14:50:52 +00:00
Jim Jagielski
3788e4cf66 Oh joy. Fold in backportable proxy changes/improvements 
from trunk as of r772279



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772280 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 14:33:45 +00:00
Jim Jagielski
3b1cbbe244 At least for right now, mod_heartbeat is not proposed for 2.2.x 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772266 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 13:56:20 +00:00
Jim Jagielski
bbc0d504e5 Add these in from trunk... 
We can easily remove should we wish to maintain the
2.2 dev struct...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772263 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 13:48:54 +00:00
Jim Jagielski
668c42d747 Branch off a location where we can play with backports from 
trunk and 2.2-specific fixes related to mod_proxy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@767920 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-23 13:43:38 +00:00
Ruediger Pluem
83fb2951d6 * Add a comment to the showstoppers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@767815 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-23 06:13:23 +00:00
Jean-Frederic Clere
ddd80550d4 My votes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@767419 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-22 09:11:03 +00:00
André Malo
895e826c3d update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766684 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-20 13:06:31 +00:00
André Malo
bc6d22f894 backport: fix ID 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766682 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-20 13:05:04 +00:00
André Malo
3b457f2c8b update convmap 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766677 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-20 12:59:24 +00:00
Nilgun Belma Buguner
ffb9824f0e syncing 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766474 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-19 14:34:09 +00:00
Lucien Gentis
13c4ee7d5a Version update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766469 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-19 14:06:19 +00:00
Vincent Bray
757c1d8a54 update xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766351 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-18 16:32:24 +00:00
Vincent Bray
aa085b29b3 s/MMapStatic/MMapFile/ and copy changes from trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766350 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-18 16:30:26 +00:00
Jim Jagielski
b54a5accad Merge r757741 from trunk: 
* Fix a memory leak by freeing the memory consumed by the bucket.

PR: 44948
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766002 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:44:27 +00:00
Jim Jagielski
da1b3b0a47 Merge r755190 from trunk: 
* APR_BUCKET_NEXT is wrong here as we are already a doing a APR_BUCKET_NEXT in
  the for loop and this causes us to jump *two* buckets forward. This can cause
  us to jump over the Sentinel of the brigade and thus causes an endless loop.


Submitted by: rpluem
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766001 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:42:57 +00:00
Jim Jagielski
5cd8c3e860 Merge r756671, r756675, r756678, r756683 from trunk: 
Creation of external gzip process fails, if we
try to set the working directory to r->filename.
Use ap_make_dirstr_parent() instead, like in all
other similar places.


Creating the external gzip process fails, because we
call execve() with "gzip" without full path.
Let's look for it in the PATH instead and drop the
passing of the environment. There seems to be no
reason why gzip should need the httpd environment.


Set the content encoding for compressed content
even if we can't detect the content type of the
uncompressed content.


When trying to detect the content type of the
uncompressed content it is often not enough
to read the same number of bytes, we already
read compressed. Since uncompress() allocates a
new buffer, we can increase the number of bytes
to read to the same size, we use in the case,
where the content isn't compressed.

Furthermore zero-terminate the read data to keep
assumptions consistent with the uncompressed case.

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@765999 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:42:03 +00:00
Jim Jagielski
bbc16c8d6d Merge r761329 from trunk: 
The remote port information was forgotten from the builtin
data of the AJP 13 protocol.  Since the servlet spec allows
to retrieve it via getRemotePort(), we provide the port to
the Tomcat connector as an additional request attribute.
Modern/future Tomcat versions know how to retrieve
the remote port from the attribute AJP_REMOTE_PORT.

See:
https://issues.apache.org/bugzilla/show_bug.cgi?id=41263
http://svn.eu.apache.org/viewvc?view=rev&revision=756926
http://svn.eu.apache.org/viewvc?view=rev&revision=757223

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@765998 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:40:08 +00:00
Jim Jagielski
0d6dfd0bb1 Approved backedports: 
-     http://svn.apache.org/viewvc?view=rev&revision=649162
-     http://svn.apache.org/viewvc?view=rev&revision=649176
-     http://svn.apache.org/viewvc?view=rev&revision=649460



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@765997 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:36:50 +00:00
Jim Jagielski
f2b9ffdae4 Bump up 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@765995 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:34:52 +00:00
Jim Jagielski
ad7b1ed3ca Had time last night for some reviews and tests 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@765994 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:34:08 +00:00
Greg Ames
6712aff4cd vote 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@765001 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-14 23:31:32 +00:00
Greg Ames
6c1c667b26 vote for a mod_substitue backport 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@764957 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-14 21:19:40 +00:00
Nilgun Belma Buguner
cd2956490f update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@764705 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-14 08:15:26 +00:00
Nilgun Belma Buguner
897fd65c51 New Turkish translation 
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@764704 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-14 08:14:47 +00:00
Ruediger Pluem
92a3a11f94 * Add proposals 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@764242 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-11 19:57:38 +00:00
William A. Rowe Jr
dc2d86e26f votes and promotes, one showstopper 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@764234 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-11 19:00:56 +00:00
Ruediger Pluem
8411e2f79a * Vote. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@764232 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-11 18:57:18 +00:00
Ruediger Pluem
dd14ac56e3 * Add proposal. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@763402 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-08 21:25:37 +00:00
Ruediger Pluem
04bdd7e1a6 * Whitespace changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@763380 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-08 20:35:37 +00:00
Roy T. Fielding
1ee973d411 holy crap, how did that bug manage to persist for 15 months? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@761854 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-04 01:31:27 +00:00
Roy T. Fielding
592d71ba45 Revert changes in 2.2.11 that caused an invalid 
etag to be emitted for on-the-fly gzip content-encoding.
PR 39727 will require larger fixes and this fix was far more
harmful than the original code.

PR: 45023, 39727


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@761835 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-03 23:16:03 +00:00
Rainer Jung
7dfcf5cfd2 Add backport proposal. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@761330 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-02 15:53:35 +00:00
Nilgun Belma Buguner
aae563d411 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@759504 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-28 16:36:37 +00:00
Nilgun Belma Buguner
7c132d5c68 update for sync with English docs. 
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@759503 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-28 16:35:43 +00:00
Jim Jagielski
66c1e4df89 lots of updated xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@757847 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-24 15:29:39 +00:00
Jim Jagielski
3d96ba6887 Docs are easier than code sometimes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@757836 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-24 15:14:56 +00:00
Lucien Gentis
98b57d8b78 Small typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@757187 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-22 13:36:04 +00:00
Rainer Jung
bb18f8e199 Propose backport of fix for mod_mime_magic 
in combination with encoded content.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@756697 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-20 18:12:46 +00:00
Rich Bowen
da8352f375 %{REQUEST_URL} is now %{REQUEST_URI}, and has been for quite some time. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@755338 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-17 18:12:29 +00:00
Rich Bowen
90478ce306 Add an example of wildcard ServerAlias. 
Replace <VirtualHost *> with <VirtualHost *:80>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@752891 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-12 15:18:17 +00:00
Jim Jagielski
70699d021e Backported and commited 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@752129 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-10 15:00:54 +00:00
Jim Jagielski
549a1e5488 Looks like 3 to me. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@752127 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-10 14:59:07 +00:00