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

May 31, 2002

The apr_bucket change requires a minor MMN bump. Also modify Apache's · abb9c2f9

Ryan Bloom authored May 31, 2002

filters to use APR_BUCKET_IS_METADATA macro.


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

abb9c2f9

if we autoindex, discard the request body and check for any · 9126d856

Jeff Trawick authored May 31, 2002

errors doing so


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

9126d856

If the request doesn't have a body, then don't try to read it. Without · 72474d28

Ryan Bloom authored May 31, 2002

this, the httpd-test suite was taking five minutes for EVERY test.


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

72474d28

· 0b72270d

William A. Rowe Jr authored May 31, 2002

Enable SSL negotation in ab.c. It is that, or remove all the entirely
BOGUS ssl config options from ab.c. If it works, nifty, if not, we now
have directives that have some effect, rather than no effect, for SSL.

Submitted by: Madhu Mathihalli <madhusudan_mathihalli@hp.com>

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

0b72270d

Fixed the @exp_cgidir@ replacement value so that it resolves to the correct · ba18612d

Bradley Nicholes authored May 31, 2002

location when the AWK file generates the default httpd.conf file for NetWare.


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

ba18612d

Added mod_cgi and mod_netware to the NetWare make files. · 56f0d0f2
Bradley Nicholes authored May 31, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95449 13f79535-47bb-0310-9956-ffa450edef68
```
56f0d0f2

Finally able to add real CGI functionality on NetWare · 5fcafaa5

Bradley Nicholes authored May 31, 2002


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

5fcafaa5

· 9f3db0e3

William A. Rowe Jr authored May 31, 2002

Well, know that I'm aware that the ssl stuff was entirely premature, it's
still worth committing the correct code to handle the port number.

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

9f3db0e3

Implemented ap_os_create_privileged_process() for NetWare which simply maps to · 386cf9ca
Bradley Nicholes authored May 31, 2002
```
apr_proc_create()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95446 13f79535-47bb-0310-9956-ffa450edef68
```
386cf9ca
Added mod_cgi and mod_netware as built in module in the NetWare build · df337551
Bradley Nicholes authored May 31, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95445 13f79535-47bb-0310-9956-ffa450edef68
```
df337551

Added mod_cgi and mod_netware to the build project · 78dd4ec3

Bradley Nicholes authored May 31, 2002


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

78dd4ec3

Fix segfault when x hasn't been initialized and tighten its scope. · 39b200cf
Justin Erenkrantz authored May 31, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95443 13f79535-47bb-0310-9956-ffa450edef68
```
39b200cf

· 831bc836

William A. Rowe Jr authored May 31, 2002

Locks are good, provide locks. ab -s -c >1 is [was?] dying on Win32
while -s -c 1 works just fine. Still investigating.

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

831bc836

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