Commits · feddbe9bee22b15df644ca2e601b7ef10bd6ce51 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

May 31, 2002

Fix typo. · feddbe9b

Yoshiki Hayashi authored May 31, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95437 13f79535-47bb-0310-9956-ffa450edef68

feddbe9b

we should be copying over all metadata buckets we don't understand, not · e2cf730b

Cliff Woolley authored May 31, 2002

just error buckets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95428 13f79535-47bb-0310-9956-ffa450edef68

e2cf730b

New Japanese translation. · f9afdfcf

Yoshiki Hayashi authored May 31, 2002

Submitted by: Hiroaki KAWAI <hawk@bcl.t.u-tokyo.ac.jp>
Reviewed by: Yoshiki Hayashi

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95427 13f79535-47bb-0310-9956-ffa450edef68

f9afdfcf

Fix the case where we generate both a 401 and 413 and we go bonkers. · c9163b9b

Justin Erenkrantz authored May 31, 2002

- If an error would drop the connection, we do not return the top-level
  error anymore as we will assume this new one takes precedence over the
  original error.  This also ensures that we will not read the input
  body (which is the point of returning these special error messages in
  the first place).
- The ap_discard_request_body return value in ap_die() must be checked
  to make sure we don't encounter this recursive case and print two errors.

Kudos to Jeff Trawick for his sample input which pointed this out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95426 13f79535-47bb-0310-9956-ffa450edef68

c9163b9b

Judging from the example below, this sentence has one too many negative in it. · 8bd0ea86

Yoshiki Hayashi authored May 31, 2002

Also fix what I believe is a typo.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95425 13f79535-47bb-0310-9956-ffa450edef68

8bd0ea86

Fix the case where if there is no ErrorDocument specified for an error, · fcfce9d9

Justin Erenkrantz authored May 31, 2002

the error would be sent to the client *twice* because both the filter
and the core would trigger error responses.

The problem is that the filters have already handled some errors (say 413)
and due to the ap_get_client_block API, the error was morphed into 400.
Therefore, ap_discard_request_body must use brigades directly rather than
the ap_get_client_block API so that any potential errors are not dropped.

The special value AP_FILTER_ERROR indicates that the lower level has
already dealt with this problem (ap_die() will realize this). Otherwise,
we'll error with HTTP_BAD_REQUEST and ap_die() will take it from there.

This also prevents needless memory copies when we are just going to
discard it anyway.

Thanks to Cliff Woolley who found this wacky problem.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95424 13f79535-47bb-0310-9956-ffa450edef68

fcfce9d9

items_to_fix--; · 4c4945f6

Justin Erenkrantz authored May 31, 2002

cliff++;  (Cliff rocks for picking up after my mess and fixing this.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95422 13f79535-47bb-0310-9956-ffa450edef68

4c4945f6

fix some major badness: error buckets *cannot* use simple_copy because · 3587dbd0

Cliff Woolley authored May 31, 2002

they're not simple buckets. they have a private data structure which
gets freed. if you're going to copy them and share whatever ->data points
to (which is what simple_copy does), you have to refcount the structure,
which is the whole point of apr_bucket_refcount and apr_bucket_shared_copy.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95421 13f79535-47bb-0310-9956-ffa450edef68

3587dbd0

Removing mod_bucketeer from the output filters seems to be the cure. Why? · 6c59a69a

Justin Erenkrantz authored May 31, 2002

So, this isn't a showstopper since no one will enable bucketeer in
production.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95420 13f79535-47bb-0310-9956-ffa450edef68

6c59a69a

This fixes a failed assert when r->remaining is left in a negative · e38ca769

Aaron Bannert authored May 31, 2002

state and we hit some other error (like permission failure) causing
an internal redirect causing us to reevaluate the input buffers
(for discarding the request body).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95419 13f79535-47bb-0310-9956-ffa450edef68

e38ca769

May 30, 2002

This should have remained cleanup not a re-creation. · d22dbe73

Justin Erenkrantz authored May 30, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95418 13f79535-47bb-0310-9956-ffa450edef68

d22dbe73

showstoppers++; (groan) · bdb13083

Justin Erenkrantz authored May 30, 2002

I need to step away from this for a half hour or so because I'm
completely confused as to how we are even getting in this state.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95417 13f79535-47bb-0310-9956-ffa450edef68

bdb13083

- Fix case where the initial chunk length was 0 was not handled correctly. · f7744d68

Justin Erenkrantz authored May 30, 2002

- Fix bucket lifetimes so that they don't live longer than their brigades.
  That's not nice.
- Simplify some usage of f->r->connection to f->c in the bucket creation
  calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95416 13f79535-47bb-0310-9956-ffa450edef68

f7744d68

This definitely gets the award for least useful error message of the month. · 86ab78e2

Cliff Woolley authored May 30, 2002

Not only should it just say "can't do that on win32," which is after all
the bottom line, it was spitting out openssl error messages which were
totally useless.  Eg:

[30/May/2002 17:31:17 05760] [error] Init: PassPhraseDialog BuiltIn not
supported in server private key from file
F:/Apache/Apache2/conf/ssl/secure.key (OpenSSL library error follows)
[30/May/2002 17:31:17 05760] [error] OpenSSL: error:0D084069:asn1
encoding routines:d2i_ASN1_SET:bad tag
[30/May/2002 17:31:17 05760] [error] OpenSSL: error:0D09D082:asn1
encoding routines:d2i_RSAPrivateKey:parsing
[30/May/2002 17:31:17 05760] [error] OpenSSL: error:0D09B00D:asn1
encoding routines:d2i_PrivateKey:ASN1 lib

Which is essentially saying "OpenSSL couldn't read your private key because
it was encrypted, and we can't get the passphrase the way you asked us to
on this platform."


Brought to my attention by the inquiry of:  Chris Hsiang <chsiang@ivivos.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95415 13f79535-47bb-0310-9956-ffa450edef68

86ab78e2

Why the stack buffer and the copy? This seems much more straightforward. · 43ea0253
Cliff Woolley authored May 30, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95413 13f79535-47bb-0310-9956-ffa450edef68
```
43ea0253

mod_bucketeer needs to preserve error buckets if it sees them rather · 349b3fbd

Justin Erenkrantz authored May 30, 2002

than silently discarding them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95412 13f79535-47bb-0310-9956-ffa450edef68

349b3fbd

Let the error bucket implement the simple copy routine. · 483b149b
Justin Erenkrantz authored May 30, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95411 13f79535-47bb-0310-9956-ffa450edef68
```
483b149b

Add macro to check for an error bucket. (Can't call it APR_BUCKET_IS_ERROR · 9715dad4

Justin Erenkrantz authored May 30, 2002

since error bucket is private to httpd - hence the AP_ prefix.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95410 13f79535-47bb-0310-9956-ffa450edef68

9715dad4

some comments after testing "apxs -g" from a 2.0.36 binbuild · 244fc038
Jeff Trawick authored May 30, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95409 13f79535-47bb-0310-9956-ffa450edef68
```
244fc038

· 95c06509

William A. Rowe Jr authored May 30, 2002

  Based on DougM's feedback to the list...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95408 13f79535-47bb-0310-9956-ffa450edef68

95c06509

· b557db8c

William A. Rowe Jr authored May 30, 2002

Apparently Roy missed this comment. Rephrase as a seperate paragraph
to more clearly split credit for OpenSSL from credit for mod_ssl.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95407 13f79535-47bb-0310-9956-ffa450edef68

b557db8c

· c26d0999

William A. Rowe Jr authored May 30, 2002

  Split out the LAYOUT


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95406 13f79535-47bb-0310-9956-ffa450edef68

c26d0999

· f9eb4947

William A. Rowe Jr authored May 30, 2002

  As we find the right places for this content, move them out in bits


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95405 13f79535-47bb-0310-9956-ffa450edef68

f9eb4947

clear up some warnings about unused variables · 72e886dc

Ian Holsman authored May 30, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95404 13f79535-47bb-0310-9956-ffa450edef68

72e886dc

· e736fc4f

William A. Rowe Jr authored May 30, 2002

Thanks for verifying these are valid, Doug. Now this [much shorter]
list should be living in our STATUS file. Question of module maps
and file layout is already off to the list.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95403 13f79535-47bb-0310-9956-ffa450edef68

e736fc4f

A tiny bit more clarification of _default_. · f4cfd079

Joshua Slive authored May 30, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95402 13f79535-47bb-0310-9956-ffa450edef68

f4cfd079

Too many people seem to try to use _default_ with name-virtual hosts. · 3b7b9a25

Joshua Slive authored May 30, 2002

Maybe this will help?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95401 13f79535-47bb-0310-9956-ffa450edef68

3b7b9a25

keep the signed-ness of char buffers consistent with what is expected · 2c395162

Jeff Trawick authored May 30, 2002

by functions they are passed to (putLong() this time)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95399 13f79535-47bb-0310-9956-ffa450edef68

2c395162

Unroll the putLong and getLong loops and correct putLong's input param type to · 726b0edb

Justin Erenkrantz authored May 30, 2002

be unsigned char* instead of char*.

Submitted by:	Sander Striker
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95397 13f79535-47bb-0310-9956-ffa450edef68

726b0edb

Update Japanese translation. · 6730d319

Yoshiki Hayashi authored May 30, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95396 13f79535-47bb-0310-9956-ffa450edef68

6730d319

New Japanese translation. · 93b214d9

Yoshiki Hayashi authored May 30, 2002

Submitted by:	Hiroaki KAWAI <hawk@bcl.t.u-tokyo.ac.jp>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95395 13f79535-47bb-0310-9956-ffa450edef68

93b214d9

Switch mod_proxy to using the brigade/filter calls directly rather than · 378eb21f

Justin Erenkrantz authored May 30, 2002

the *_client_block calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95394 13f79535-47bb-0310-9956-ffa450edef68

378eb21f

New Japanese translation. Forward port from 1.3. · 0fc7f975

Yoshiki Hayashi authored May 30, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95393 13f79535-47bb-0310-9956-ffa450edef68

0fc7f975

New Japanese translation. Forward port from 1.3. · 9a509c6a

Yoshiki Hayashi authored May 30, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95392 13f79535-47bb-0310-9956-ffa450edef68

9a509c6a

New Japanese translation. · a7dbc7ba

Yoshiki Hayashi authored May 30, 2002

Submitted by: Hiroaki KAWAI <hawk@bcl.t.u-tokyo.ac.jp>
Reviewed by: Yoshiki Hayashi

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95391 13f79535-47bb-0310-9956-ffa450edef68

a7dbc7ba

Add a PROXYREQ_RESPONSE value for request_rec->proxyreq because it is · 8dc39a0a

Justin Erenkrantz authored May 30, 2002

possible that there can be different behavior at the protocol level if
request_rec isn't really a request but a response.

This stems from the fact that request bodies must be indicated by
Content-Length or Transfer-Encoding, but response bodies do not. The
recent change to ap_http_filter to return EOS if there isn't a body broke
proxy. Therefore, there must be some way for the proxy to indicate that
this is a response. Accordingly, ap_http_filter can allow the BODY_NONE
iff this is a response.

Since r->proxyreq is set to PROXYREQ_PROXY even for the original request
from the client, that value isn't sufficient. Hence, the introduction of
PROXYREQ_RESPONSE.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95390 13f79535-47bb-0310-9956-ffa450edef68

8dc39a0a

· aad30330

William A. Rowe Jr authored May 30, 2002

All rather stale. Any new/remaining issues should be moved to CHANGES
in the present tense, as opposed to the "Future port to 2.0". Heh

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95389 13f79535-47bb-0310-9956-ffa450edef68

aad30330

Imagine the horror. I go to try compiling PHP4, and it bombs out on · 412b9c17

Cliff Woolley authored May 30, 2002

r->boundary.  BUT WAIT, I say, we have a test in there for that:
#if !MODULE_MAGIC_AT_LEAST(20020506,0).  The test doesn't seem to be
working.  That's odd, I think.  So I go look at the ap_mmn.h.  Egad,
the tests are totally backwards.  How on earth are we going to handle this?
Surely it's wrong in 1.3.x as well.  So I go look.  Nope, turns out it
got fixed TWO YEARS AGO in that repository.  Sigh.  Anyway, thanks Greg.
:)

Submitted by:	Greg Stein, circa Apache 1.3.13


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95388 13f79535-47bb-0310-9956-ffa450edef68

412b9c17

· f50d71cd

William A. Rowe Jr authored May 30, 2002

Now a moot issue.

Isn't it time to just drop "PRs that have been suspended forever waiting
for someone to put them into 'the next release'" if they have no status?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95387 13f79535-47bb-0310-9956-ffa450edef68

f50d71cd

mod_cgid got hit too with this change · f9b38e5a

Justin Erenkrantz authored May 30, 2002


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95386 13f79535-47bb-0310-9956-ffa450edef68

f9b38e5a