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

Sep 29, 2004

* modules/http/http_protocol.c (ap_http_filter): Always fail if the · af5bc175

Joe Orton authored Sep 29, 2004

Content-Length header is an empty string; previously this was only
an error with some strto* implementations.

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

af5bc175

Sep 28, 2004

Try to correctly follow RFC 2616 13.3 on validating stale cache responses by · 3a37af26

Justin Erenkrantz authored Sep 28, 2004

teaching mod_cache's cache_select_url and cache_save_filter how to deal with
this corner case.

* modules/experimental/cache_storage.c
  (cache_select_url): If we have a stale entry, save the handle so that
  cache_save_filter can use it later, and make the request conditional.
* modules/experimental/cache_util.c
  (ap_cache_request_is_conditional): Take in a table rather than request_rec.
* modules/experimental/mod_cache.c
  (cache_out_filter): Fix bogus comment.
  (cache_save_filter): If we have already responded to the client, block all
  data; correctly merge in 'stale' handles that are not really stale; set
  r->status where appropriate; serve cached response if 'fresh'
* modules/experimental/mod_cache.h
  (cache_info): Add a status field.
  (cache_request_rec): Add stale handle field and note we may block responses.
  (ap_cache_request_is_conditional): Update prototype.
* modules/experimental/mod_disk_cache.c
  (store_headers): Use cache_info status instead of r->status.
* modules/experimental/mod_mem_cache.c
  (recall_headers): Properly recall the status field.
  (store_headers): Store the status field via cache_info status.


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

3a37af26

update transformation · c32dcda7

Andre Malo authored Sep 28, 2004


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

c32dcda7

Reformat code to no tab and no CR-LF · dafdf2d4

Mladen Turk authored Sep 28, 2004


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

dafdf2d4

Make sure that we don't increase balancer worker count on · 9b01dd34

Mladen Turk authored Sep 28, 2004

gracefull restart. Thanks to Christian...again.


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

9b01dd34

mod_disk_cache: Do not store aborted content. · 30aa9ac5

Justin Erenkrantz authored Sep 28, 2004

PR: 21492
Submitted by:	R�diger Pl�m <r.pluem t-online.de>
Reviewed by:	Justin Erenkrantz


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

30aa9ac5

mod_disk_cache: Correctly store cached content type. · e90ce9ce

Justin Erenkrantz authored Sep 28, 2004

PR: 30278
Submitted by:	R�diger Pl�m <r.pluem t-online.de>
Reviewed by:	Justin Erenkrantz


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

e90ce9ce

Bring up to date a little, and don't talk about building PHP3(!). · b2b2e50a
Joe Orton authored Sep 28, 2004
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105312 13f79535-47bb-0310-9956-ffa450edef68
```
b2b2e50a

Prevent .nf/.fi regions being sucked up by normalize-space in · b68f4694

Joe Orton authored Sep 28, 2004

apxs.8.


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

b68f4694

* support/apxs.in: Ensure that only a .la target filename is passed on · c6d68ea2

Joe Orton authored Sep 28, 2004

the libtool link line otherwise libtool tries to link statically.

PR: 31448 (more)

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

c6d68ea2

* support/apxs.in: Reset $opt so that -I, -D and -Wc,* options are not · edbf46a9

Joe Orton authored Sep 28, 2004

passed to the libtool link line.  For "-Wl,-foo" pass "-foo" on the
link line regardless of whether gcc is used; without guessing whether
libtool --mode=link will invoke gcc or some native ld the previous
behaviour is not really correct.

PR: 31448


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

edbf46a9

Sep 26, 2004

Initialize workers for every virtual server not just for default one. · 62041e21
Mladen Turk authored Sep 26, 2004
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105298 13f79535-47bb-0310-9956-ffa450edef68
```
62041e21

* server/util_filter.c (ap_save_brigade): Handle an ENOTIMPL setaside · c6ceb146

Joe Orton authored Sep 26, 2004

function correctly.

* modules/generators/mod_cgi.c (cgi_handler): Revert r1.169,
unnecessary CGI bucket lifetime kludge.

PR: 31247


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

c6ceb146

Use the Christian von Roques's idea that makes the election mechanism · 5393f11b

Mladen Turk authored Sep 26, 2004

much simpler. This also removes the need to count the number of free
connections per channel.

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

5393f11b

Count the bytes trasfered and readed so we can display the actual · ad468b18

Mladen Turk authored Sep 26, 2004

data traffic, and add additional balancer mechanism that will use the
data traffic into account.

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

ad468b18

Remove proxy_runtime_worker and make the things simpler by · 8c0c69c5

Mladen Turk authored Sep 26, 2004

sharing runtime status accross child processes. Also make sure
that shared data is initialized after the scoreboard is created.

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

8c0c69c5

Sep 24, 2004

this fix backported to 2.0 · 882f6214

Bill Stoddard authored Sep 24, 2004


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

882f6214

port · 75099a46

Bill Stoddard authored Sep 24, 2004


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

75099a46

Tell mod_mem_cache that we will no longer be serving this object if it is stale. · e2a280fe

Justin Erenkrantz authored Sep 24, 2004

Submitted by: Bill Stoddard
Reviewed by:  Justin Erenkrantz


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

e2a280fe

Sep 23, 2004

Note a backport. · 126e022f

Graham Leggett authored Sep 23, 2004

PR:
Obtained from:
Submitted by:
Reviewed by:


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

126e022f

* server/mpm_common.c (dummy_connection): Log the address if the · 2b6cdf13

Joe Orton authored Sep 23, 2004

connect() fails.


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

2b6cdf13

Sep 22, 2004

Fix race conditions in mod_disk_cache by properly using the tempfile rather · 0e3befc3

Justin Erenkrantz authored Sep 22, 2004

than the data file. (We rename the tempfile when we're completed with the data
file which is an atomic operation.)

Part of the code assumed that it was using a temporary file; other parts
wrote directly to the body file - which was incorrect. So, clean up the
whole mess to be consistent and more correct.

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

0e3befc3

Cleanup a style nit. No functional changes. · a2e8bbe7

Justin Erenkrantz authored Sep 22, 2004


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

a2e8bbe7

Fix up some comments in CACHE_SAVE filter and fix a minor style nit. · a4a2e066

Justin Erenkrantz authored Sep 22, 2004

No functional changes.


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

a4a2e066

* server/log.c (log_error_core): For APLOG_DEBUG on Unix, if __FILE__ · b07d099c

Joe Orton authored Sep 22, 2004

is an absolute path (as in a VPATH build), just log the basename.


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

b07d099c

WIN64: first in a series to get Windows IA64 builds clean, this serves pages · ce43092c
Allan K. Edwards authored Sep 22, 2004
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105257 13f79535-47bb-0310-9956-ffa450edef68
```
ce43092c

Remove the second initialisation of the variable to NULL. It is already · 9e057a3a

Graham Leggett authored Sep 22, 2004

NULL in the definition.
PR:
Obtained from:
Submitted by:
Reviewed by:


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

9e057a3a

* modules/ssl/ssl_engine_io.c (ssl_io_filter_connect): Return · ec179d34

Joe Orton authored Sep 22, 2004

502 not 501 if SSL_connect() fails for a proxy connection.

PR: 31083


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

ec179d34

* modules/generators/mod_cgi.c (cgi_handler): Fix possible segfaults · bbeb0516

Joe Orton authored Sep 22, 2004

in CGI bucket methods if invoked from a subrequest.

PR: 31247


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

bbeb0516

* modules/ssl/ssl_scache_shmcb.c (ssl_scahe_shmcb_init): If anonymous · 07b2af2b

Joe Orton authored Sep 22, 2004

shm is not supported, always remove the named segment first to cope
with unclean shutdowns.

PR: 21335 (continued)


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

07b2af2b

* server/scoreboard.c (create_namebased_scoreboard): Use · 9ab5d70c

Joe Orton authored Sep 22, 2004

apr_shm_remove() rather than the unsufficient apr_file_remove().

PR: 27189


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

9ab5d70c

* modules/ssl/ssl_engine_vars.c: Map "UID" suffix to the same OID · 53aed8b0

Joe Orton authored Sep 22, 2004

(2.5.4.45) for old and new versions of OpenSSL.


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

53aed8b0

a few new translations and up-to-date patches · 27693176

Jeon Jeongho authored Sep 22, 2004


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

27693176

Sep 21, 2004

Fix Expires (freshness) handling in mod_cache. · c65e6d74

Justin Erenkrantz authored Sep 21, 2004

Previously, if the cached copy was stale, the response would go into an
indeterminate state.  Therefore, the freshness check must be done before we
'accept' the response and, if it fails (i.e.  stale), we can't allow any side
effects.

This caused a number of changes to how mod_disk_cache reads its headers as
ap_scan_script_header_err() purposely has side-effects and that's
unacceptable.  So, factor out only what we need.

Also, remove the broken conditional filter code as you can't reliably alter the
filter list once the response is started.  (Regardless, cache_select_url()
has the freshness checks now.)

Assist to Sascha Schumann for reporting mod_cache was busted.


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

c65e6d74

In order for mod_expires to work with mod_cache, mod_expires has to go first. · 429e9d82

Justin Erenkrantz authored Sep 21, 2004

Otherwise, mod_cache has no clue that the response has a limited lifetime.


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

429e9d82

Update to enable mod_filter harness to be a Provider (for chaining rules). · 2e32eff1
Nick Kew authored Sep 21, 2004
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105233 13f79535-47bb-0310-9956-ffa450edef68
```
2e32eff1

* server/protocol.c (ap_rgetline_core): Never NUL terminate at · 52f75b0f

Joe Orton authored Sep 21, 2004

(*s)[-1] for caller-supplied *s.

Submitted by: Rici Lake <ricilake speedy.com.pe>


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

52f75b0f

* configure.in: Only export CC and CPP if a cache file is not · aa359f50

Joe Orton authored Sep 21, 2004

specified.


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

aa359f50

update transformation · 7245391c

Andre Malo authored Sep 21, 2004


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

7245391c

SECURITY: CAN-2004-0811 officially part of 2.0.52 · 5f320e14

Geoffrey Young authored Sep 21, 2004


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

5f320e14