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

16115 Commits

Author SHA1 Message Date
Jim Jagielski
8f5558a1f1 Use apr func
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@544147 13f79535-47bb-0310-9956-ffa450edef68
2007-06-04 13:07:48 +00:00
Ruediger Pluem
7aa6c2295a * It does not matter if this pid is still in the scoreboard or not. We need to
remove it from our pid table in any case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543785 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 21:13:27 +00:00
Jim Jagielski
6f342d9c0b The unregister part should also remove from pid table.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543735 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 13:22:44 +00:00
Jim Jagielski
f89d7c2e02 not yet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543734 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 13:03:44 +00:00
Jim Jagielski
21fc8bc1c2 Minor nit... be consistent and unset even now :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543667 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 23:44:36 +00:00
Ruediger Pluem
a311837d96 * Use local pid table also for OS/2 MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543654 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 23:04:43 +00:00
Jim Jagielski
7f7a0bbaec pid is proc here :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543587 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 19:46:08 +00:00
Jim Jagielski
a2d88accbc Create work-in-progress branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543583 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 19:28:31 +00:00
Eric Covener
9a29cd5f65 SECURITY: CVE-2007-1862 (cve.mitre.org)
mod_mem_cache: Copy headers into longer lived storage; header names and
values could previously point to cleaned up storage

PR: 41551
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@543515 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 15:50:12 +00:00
Ruediger Pluem
5ebab647ff * Prevent running through the error stack by returning OK and setting r->status
accordingly if ret is HTTP_NOT_MODIFIED as this breaks mod_cache validating a
  stale entity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541990 13f79535-47bb-0310-9956-ffa450edef68
2007-05-27 13:57:46 +00:00
Ruediger Pluem
bd03736495 * Also add a possible ETag header to r->headers_out. We need to have it there
for our later call to ap_meets_conditions a few lines above. Having it put
  in the merge table will fail as merge and r->err_headers_out get merged
  AFTER our call to ap_meets_conditions. Besides of this having multiple
  ETag headers (or a merged version of them) does not seem to make sense.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541974 13f79535-47bb-0310-9956-ffa450edef68
2007-05-27 11:26:04 +00:00
Nick Kew
d09a836fb0 PR#39710 - badly broken errordocuments for CGI
We've just had another duplicate report of this on bugzilla.
We've got a simple patch, and people asking WTF is going on
with inaction.  Noone seems clear on why the patch shouldn't
be applied (http://marc.info/?l=apache-httpd-dev&m=117760311129386&w=2).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541926 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 18:50:18 +00:00
Rich Bowen
972efb077f Adds an example using multiple file extensions, to answer a
frequently-asked (IRC) question that came up yet again today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541685 13f79535-47bb-0310-9956-ffa450edef68
2007-05-25 15:11:46 +00:00
Sander Temme
fb5c8b941c Explain that POST data should be sent as the correct MIME type.
Submitted by Vincent Bray noodlet at gmail dot com, 
edited and reviewed by sctemme


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541138 13f79535-47bb-0310-9956-ffa450edef68
2007-05-24 02:19:04 +00:00
Chris Darroch
af98980f19 apr_dbd_check_conn() just returns APR_SUCCESS or APR_EGENERAL, so we
don't actually have a driver-specific value to pass to apr_dbd_error(),
but that's OK because most/all drivers just ignore this value anyway


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539687 13f79535-47bb-0310-9956-ffa450edef68
2007-05-19 05:01:44 +00:00
Justin Erenkrantz
3019f9a87b mod_cache: Do not set Date or Expires when they are missing from the original
response or are invalid.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539621 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 22:42:59 +00:00
Justin Erenkrantz
cd208845d6 mod_cache: Correctly handle HEAD requests on expired cache content. PR 41230.
* modules/cache/mod_cache.c
  (cache_save_filter): Properly handle HEAD responses when we have a stale handle.

(This patch was revised by Justin/Ruediger.)

Submitted by: Niklas Edmundsson
Reviewed by: Justin, Ruediger


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539620 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 22:38:08 +00:00
Jim Jagielski
e63f9fbad4 Document new directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539433 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 12:43:55 +00:00
Jim Jagielski
ceb2de55e9 Backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539431 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 12:41:52 +00:00
Justin Erenkrantz
de511d0aab Sync with 2.2.5 CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539282 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 06:15:11 +00:00
Ruediger Pluem
3469f8e111 * Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539119 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 21:16:56 +00:00
Justin Erenkrantz
1b7508dd21 mod_cache: Let Cache-Control max-age set the expiration of the cached
representation if Expires is not set.

* modules/cache/mod_cache.c
  (cache_save_filter): If Cache-Control max-age is set and Expires isn't,
  let that value control our expiration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539063 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 18:25:13 +00:00
Justin Erenkrantz
c795f75fea mod_disk_cache: If the Vary'd content is stale, we can handle it via our
freshness tests which will attempt to revalidate the content.

* modules/cache/mod_disk_cache.c
  (open_entity): If the root Vary index is stale, we don't need to throw away
  potentially stale content - we can try to refresh it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539054 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 18:17:23 +00:00
Justin Erenkrantz
9b5dff0669 mod_disk_cache: When renegotiating an already cached Vary'd response, do not
let us later throw away the renegotiated content due to a name mismatch.

We do not need to update the ->name field just before writing the headers as
the computed ->name on open and create is sufficient.  Updating ->name here is
essentially a no-op - except in the case of Vary where the key has internally
changed (to account for the Vary prefix), but the original name has not.
However, writing the Vary'd-accounted key means that when we read the cache
next that we will error out and disregard the just renegotiated response and
fetch the content all over again - oops!

(This is largely a case where I think we may have overthought ourselves; hence
the explanation is here in the commit rather than in the file itself.)

* modules/cache/mod_disk_cache.c
  (store_headers): The originally opened ->name is sufficient.
* CHANGES: Combined with r538992, note that renegotiation for Vary's seem to
  work far better.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538997 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 16:20:06 +00:00
Justin Erenkrantz
c1150a199a mod_disk_cache: When renegotiating an already cached Vary'd response, create
the refreshed .vary structure in the right directory.  Otherwise, we'll create
a new .vary layout underneath the already existing one - oops!

* modules/cache/mod_disk_cache.c
  (store_headers): Temporarily clear dobj->prefix if it is set to ensure that
  we create the .vary structure underneath the cache root.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538992 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 16:10:29 +00:00
Ruediger Pluem
d9fc60e714 * Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538869 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 10:59:31 +00:00
Justin Erenkrantz
35713c177f RFC 2616 13.2.1 calls out max-age as being a valid 'explicit expiration time',
so per Sec. 13.9 permit queries with just max-age instead of only Expires.

* modules/cache/mod_cache.c
  (cache_save_filter): Be closer to RFC 2616's intent for query arguments.
* CHANGES: Update.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538807 13f79535-47bb-0310-9956-ffa450edef68
2007-05-17 05:43:18 +00:00
Jim Jagielski
f2551e79f4 Doccos update... sync up to current time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537600 13f79535-47bb-0310-9956-ffa450edef68
2007-05-13 15:29:06 +00:00
Jim Jagielski
09c3cbe87b Fold in ProxyPassMatch directive with docs. Support
full regex substitution but also allow for "simple"
cases (ala JkMount) to work as well.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537599 13f79535-47bb-0310-9956-ffa450edef68
2007-05-13 15:28:29 +00:00
Jim Jagielski
5fdd230cc1 Add regex pattern matching to ProxyPass, allowing,
for example:

   ProxyPass ~ \.gif balancer://imagecluster




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537429 13f79535-47bb-0310-9956-ffa450edef68
2007-05-12 14:12:24 +00:00
Mladen Turk
fdd27d85c5 Add detection for post XP operating systems.
Think this can be safely backported to 2.2 and 2.0 branches

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@536052 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 04:45:54 +00:00
Ruediger Pluem
0c5d52c714 * Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535907 13f79535-47bb-0310-9956-ffa450edef68
2007-05-07 15:37:36 +00:00
Ruediger Pluem
63351a529b - In AP_MODE_SPECULATIVE ap_core_input_filter returns APR_SUCCESS and an empty
brigade in the case that a non blocking read from the socket returned
  APR_EAGAIN. So getting an empty brigade also shows that no data is present
  in the input filter.
  While this reduces the number of false positives for "real data" in the input
  filter the behaviour is not as good as before 533820 because if there are
  only CRLF's in the input filter we do not flush, but we should. To fix this
  it seems that a simulation of AP_MODE_EATCRLF is needed inside of
  check_pipeline.
- Destroy brigade bb at the end of the function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535879 13f79535-47bb-0310-9956-ffa450edef68
2007-05-07 14:20:09 +00:00
Ruediger Pluem
6ad514ccc1 * Prevent a segmentation fault if one of the Cache-Control headers
s-maxage, max-age, min-fresh, max-stale has no value assigned.
  In this case ignore s-maxage, max-age, min-fresh. For max-stale
  it is valid to set no value. In this case set max-stale to 1 year
  to signal that the client is accepting a stale response of any age.

Submitted by: Niklas Edmundsson <nikke acc.umu.se>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535617 13f79535-47bb-0310-9956-ffa450edef68
2007-05-06 14:35:02 +00:00
Greg Ames
d9c3aa0345 the problem with Event and mod_ssl was fixed with rev. 533820. I'm not
aware of problems with other input filters that aren't addressed in that fix.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535370 13f79535-47bb-0310-9956-ffa450edef68
2007-05-04 20:12:46 +00:00
Jim Jagielski
1c8f89ea65 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.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535354 13f79535-47bb-0310-9956-ffa450edef68
2007-05-04 19:12:38 +00:00
Joshua Slive
853d40b6dd As discussed on docs@httpd, remove the FAQ and replace it with the contents
of the old support.xml and a pointer to the wiki.

Of possible interest: I've also removed the link to the professional support
database, since it was returning error 500 for some time and nobody
seemed to care.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535248 13f79535-47bb-0310-9956-ffa450edef68
2007-05-04 14:13:42 +00:00
Ruediger Pluem
56acf588e4 * 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535169 13f79535-47bb-0310-9956-ffa450edef68
2007-05-04 11:11:26 +00:00
Hiroaki Kawai
542aaff5f0 English Revision: 478131
Submitted by: Takashi Sato
Reviewed by: Hiroaki Kawai


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535117 13f79535-47bb-0310-9956-ffa450edef68
2007-05-04 07:15:24 +00:00
Bradley Nicholes
81f74664c4 Update the status of the access control directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@534536 13f79535-47bb-0310-9956-ffa450edef68
2007-05-02 16:39:40 +00:00
Bradley Nicholes
2874d54f16 re-introduce ap_satisfies API back into core and modify how the access_checker, check_user_id and auth_checker hooks are called so that they respect the precedence that is set through the satisfy ALL/ANY directive. This also restores the directives order, allow, deny, satisfyas supported directives rather than being deprecated. These directives still remain in mod_access_compat however.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@534533 13f79535-47bb-0310-9956-ffa450edef68
2007-05-02 16:31:39 +00:00
Jim Jagielski
9c13127a2f Sync with recently backported patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@534074 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 13:26:06 +00:00
Ruediger Pluem
9d24ba2573 * Rework the error handling logic to make it more readable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@534031 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 12:17:30 +00:00
Greg Ames
2c91e92953 check_pipeline: use AP_MODE_SPECULATIVE to check for data in the input filters
to accomodate mod_ssl's input filter.  AP_MODE_EATCRLF is essentially a no-op
in that filter.

this fixes missing imbedded graphics etc when using the Event MPM with mod_ssl
with HTTP pipelining enabled in the browser.  the pipelined requests after the
first were never read from mod_ssl's input filter.  it might reduce unneeded 
flushes with other MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@533820 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 18:16:06 +00:00
Hiroaki Kawai
39e8459729 English Revision: 522942
Submitted by: Takashi Sato
Reviewed by: Hiroaki Kawai


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@533511 13f79535-47bb-0310-9956-ffa450edef68
2007-04-29 14:21:15 +00:00
Rich Bowen
1512a31d2a Typo: slashed -> slashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@533344 13f79535-47bb-0310-9956-ffa450edef68
2007-04-28 13:39:20 +00:00
Greg Stein
e0b2f73fb1 Add two new mime types, per the IANA registrations:
http://www.iana.org/assignments/media-types/application/vnd.google-earth.kml+xml
  http://www.iana.org/assignments/media-types/application/vnd.google-earth.kmz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@532162 13f79535-47bb-0310-9956-ffa450edef68
2007-04-25 01:09:35 +00:00
André Malo
b0470cc5ac build all
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@532108 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 22:22:49 +00:00
André Malo
42eda3eb2c xml validation and drop the <pre>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@532107 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 22:16:42 +00:00
André Malo
ff13b5a693 build extraclean all
`build convmap`


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@531943 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 13:58:07 +00:00