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

22 Nov, 2001 11 commits

fix for a segfault that occurred when mod_include was used to deliver files shorter than 5 bytes · 1338e923
Brian Pane authored Nov 22, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92131 13f79535-47bb-0310-9956-ffa450edef68
```
1338e923

fix segv in worker MPM following check_pipe_of_death() call · 0721c430

Brian Pane authored Nov 22, 2001


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

0721c430

dont va_start() in ssl_log() unless we are actually going to log something · 07eb5d9e
Doug MacEachern authored Nov 22, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92123 13f79535-47bb-0310-9956-ffa450edef68
```
07eb5d9e

avoid a couple of calls to ssl_util_vhostid() and apr_psprintf() · d8946a15

Doug MacEachern authored Nov 22, 2001

unless loglevel >= SSL_LOG_INFO
PR:
Obtained from:
Submitted by:
Reviewed by:


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

d8946a15

optimize lookup of ssl-{unclean,accurate}-shutdown flags: · 59a9e4f0

Doug MacEachern authored Nov 22, 2001

- only look through the table once, rather than 2 apr_table_gets()
- case-sensitive and use strcmp() as little as possible
- only lookup once per-connection, as the flags will not change across
  keepalive requests
PR:
Obtained from:
Submitted by:
Reviewed by:


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

59a9e4f0

two performance improvements: · a052fc9a

Doug MacEachern authored Nov 22, 2001

- switch from using r->notes to r->request_config
- avoid a strcmp() when checking if val eq '!'

PR:
Obtained from:
Submitted by:
Reviewed by:


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

a052fc9a

return from ssl_callback_LogTracingState if sc->nLogLevel < SSL_LOG_INFO · f5a1e501

Doug MacEachern authored Nov 22, 2001

else there are 5 (expensive!) calls made to ssl_var_lookup on every request
for info that will never be logged
PR:
Obtained from:
Submitted by:
Reviewed by:


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

f5a1e501

macros for dumping the list of server_recs · 8d8f3dc1

Doug MacEachern authored Nov 22, 2001


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

8d8f3dc1

remove AP_CTX_* macros which are no longer used · 0d3e82fe

Doug MacEachern authored Nov 22, 2001


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

0d3e82fe

get rid of 'apctx' table that used to live in SSL_get_app_data2(ssl) · 92420dd5

Doug MacEachern authored Nov 22, 2001

change app_data2 to be the request_rec itself.
if something needs per-request context in the future,
it can use r->request_config

PR:
Obtained from:
Submitted by:
Reviewed by:


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

92420dd5

move c->notes.ssl::verify::depth to SSLConnRec.verify_depth · 177f2286

Doug MacEachern authored Nov 22, 2001

note: may actually be removed unless somebody can figure out why it is in
there to begin with
PR:
Obtained from:
Submitted by:
Reviewed by:


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

177f2286

21 Nov, 2001 16 commits

get rid of SSL_get_app_data2_idx() which had a race condition when · b8c617af

Doug MacEachern authored Nov 21, 2001

writing to app_data2_idx, and another inside OpenSSL when calling
SSL_get_ex_new_index().
add SSL_init_app_data2_idx() to provide the same functionality but in
a safe place: called during ssl_init_Module
PR:
Obtained from:
Submitted by:
Reviewed by:


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

b8c617af

move c->notes.ssl::verify::{info,error} to SSLConnRec.verify_{info,error} · ac259b21

Doug MacEachern authored Nov 21, 2001

PR:
Obtained from:
Submitted by:
Reviewed by:


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

ac259b21

Add mod_deflate (formerly known as mod_gz) to experimental. mod_deflate · 36e584e1

Justin Erenkrantz authored Nov 21, 2001

supports gzip transfer-encoding as an output filter.

Initially coded by Ian, but Justin made a number of improvements to
the coding style and its use of filters.

We have 7 binding +1s and no vetos in STATUS for addition.

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

36e584e1

remove test_pass_brigade; it lives in httpd-test not here · 6393e276
Doug MacEachern authored Nov 21, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92107 13f79535-47bb-0310-9956-ffa450edef68
```
6393e276

comment out module test_pass_brigade as it doesn't exist · 8b42030e

Ian Holsman authored Nov 21, 2001


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

8b42030e

move c->notes.ssl::flag::{unclean,accurate}-shutdown to SSLConnRec.shutdown_type · 8c42324a

Doug MacEachern authored Nov 21, 2001

PR:
Obtained from:
Submitted by:
Reviewed by:


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

8c42324a

Bail out at configure time if an invalid MPM was specified. · 19765ed0

Jeff Trawick authored Nov 21, 2001

Submitted by: jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>
Reviewed by: Jeff Trawick

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

19765ed0

Fix a bug in our output filter buffering. If a lot of small brigades are · c8d186a8

Ryan Bloom authored Nov 21, 2001

sent, the core will send the first 16 buckets, regardless of how much
data there is. In the pathological case, this can cause a lot of 16
byte packets. Now, if we see less than AP_MIN_BYTES, we combine
all of the buckets into a single bucket to be sent in a later packet.

This can cause a lot of memory copies, but it eases our network traffic.

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

c8d186a8

This was done a while ago. · 5419b0ec

Ryan Bloom authored Nov 21, 2001


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

5419b0ec

include the appropriate header files for ntohs and htons to prevent · 551a2f16

Greg Ames authored Nov 21, 2001

OS/390 build failures.


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

551a2f16

move c->notes.ssl::client::dn to SSLConnRec.client_dn · 14045034

Doug MacEachern authored Nov 21, 2001

PR:
Obtained from:
Submitted by:
Reviewed by:


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

14045034

start moving c->notes usage to a new SSLConnRec structure hanging off of · d21e0576

Doug MacEachern authored Nov 21, 2001

c->conn_config
PR:
Obtained from:
Submitted by:
Reviewed by: rbb, madhu


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

d21e0576

let mod_file_cache use the new apr_mmap_dup function · 8494021d

Ian Holsman authored Nov 21, 2001

Submitted by:	Brian Pane


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

8494021d

when this module's resolver calls were apr-ized recently we removed · 8d6e921d

Jeff Trawick authored Nov 21, 2001

the include of specific system header files; this left the opportunity
for htons() to be undefined... do something explicit for htons() so
we don't have to worry about what apr_network_io.h brings with it

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

8d6e921d

Fix the timeout logic that I broke last week. This adds a request · d5cf06cb

Ryan Bloom authored Nov 21, 2001

level filter that sets the timeout on the socket that is connected
to the client.

Thanks Greg Stein for seeing this bug.


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

d5cf06cb

Prevent segv in ap_note_basic_auth_failure() when no AuthName is configured · 2c5bb0e1

Doug MacEachern authored Nov 21, 2001

PR:
Obtained from:
Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	dougm


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

2c5bb0e1

20 Nov, 2001 13 commits

Gets us compiling again on FreeBSD. Adds conditional compilation around · 1e7dcdd5

Aaron Bannert authored Nov 20, 2001

thread mutex routines for when we don't have APR_HAS_THREADS.

Submitted by:	Justin Erenkrantz
Reviewed by:	Aaron Bannert


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

1e7dcdd5

It compiles and looks good. I know not of a good way to test this, · 2cf35fd3

Aaron Bannert authored Nov 20, 2001

but nobody spoke up on the list, so I'm just going to commit it.


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

2cf35fd3

No good reason to have this in <> instead of "". Having it in <> might · fa1e6548

Aaron Bannert authored Nov 20, 2001

interact badly with makefile dependency generators, too.


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

fa1e6548

Win32: Move the call to fetch the network addresses into the accept loop · 30f78924

Bill Stoddard authored Nov 20, 2001

and out of the worker threads. This makes it a bit easier to implement
accept loop processing in modules outside the MPM.

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

30f78924

apxs should be using sbindir not bindir for the path to the httpd binary. · 2d52e401

Justin Erenkrantz authored Nov 20, 2001

Committed with some minor changes.
Submitted by:	GOMEZ Henri <hgomez@slib.fr>
Reviewed by:	Justin Erenkrantz


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

2d52e401

Win32: Clean up some error paths. · b724b903

Bill Stoddard authored Nov 20, 2001


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

b724b903

Win32 bug fix: · d35b8d53

Bill Stoddard authored Nov 20, 2001

Move call to setsockopt(SO_UPDATE_ACCEPT_CONTEXT) (to cause the accept socket
to inherit the listener attributes) to after a connection has been accepted.
This piece of code prior to this fix was just wrong; not sure why I never
saw warning messages on NT or 2000.

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

d35b8d53

Get IPv6 vhosts working (again ?). · 840fcb47

Jeff Trawick authored Nov 20, 2001

There were a couple of bogus IPv4-specific comparisons which prevented
the data structures from being built correctly in ap_fini_vhost_config().
One of these (INADDR_ANY) can be easily rewritten to work with IPv6. The
other (DEFAULT_VHOST_ADDR) isn't necessary for IPv6. Note that this is
because we don't support the various flavors of _default_ that
Apache-1.3+KAME-patch supports.

PR: 8118

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

840fcb47

fix chdir_for_gprof() to s/dir/use_dir/ for chdir() · abcab7e4

Doug MacEachern authored Nov 20, 2001


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

abcab7e4

· 1d3b6d65

William A. Rowe Jr authored Nov 20, 2001

Split Justin's and my key issues, which have become tangled (yet have
nothing to do with one another.)

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

1d3b6d65

optimized away some pointer arithmetic in the inner loop of the BNDM... · 74539b30

Brian Pane authored Nov 20, 2001

optimized away some pointer arithmetic in the inner loop of the BNDM string-search function in mod_include


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

74539b30

2.0.28 was released. · e5aff673

Justin Erenkrantz authored Nov 20, 2001


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

e5aff673

optimized away some pointer arithmetic in the inner loop of the BNDM string-search function · e1f10f45
Brian Pane authored Nov 20, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92046 13f79535-47bb-0310-9956-ffa450edef68
```
e1f10f45