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

Oct 21, 2000

· c68c5509

William A. Rowe Jr authored Oct 21, 2000

  Enough of pcre.h, begone vile beast


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

c68c5509

Oct 20, 2000

· cc4b7192

William A. Rowe Jr authored Oct 20, 2000

  Don't you love clean checkouts :-)  Wrong href on dbmmanage, to boot


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

cc4b7192

Oct 19, 2000

Insert missing worg. · 82be63fd

Tony Finch authored Oct 19, 2000

Submitted by:   Chris Pepper <pepper@mail.reppep.com>


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

82be63fd

name-based vhosts should come before ip-based vhosts. · 1cdd78f8

Tony Finch authored Oct 19, 2000


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

1cdd78f8

Belatedly update the documentation to include the NameVirtualHost * · cce62d73

Tony Finch authored Oct 19, 2000

stuff. This isn't quite a sync with the 1.3 docco because we don't
want to mention 1.3 in the 2.0 docs.

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

cce62d73

Updated welcome page translation. · b5e8a5be

Joshua Slive authored Oct 19, 2000

Submitted by:	Ragnar Wisl�ff <ragnar.wisloff@asker.online.no>


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

b5e8a5be

Belatedly update the documentation to include the NameVirtualHost * · 610c19bc

Tony Finch authored Oct 19, 2000

stuff. This isn't quite a sync with the 1.3 docco because we don't
want to mention 1.3 in the 2.0 docs.

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

610c19bc

getline(): · e6bd566e

Greg Ames authored Oct 19, 2000

Fix MIME header folding for character mode (telnet) clients.
Clean up comments & tighten asserts.

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

e6bd566e

somebody was a Very Bad Boy when they inserted casts into this function. · 7053c7a5

Greg Stein authored Oct 19, 2000

casting away the const was absolutely wrong... the warnings were saying the
return value type needed to be fixed. did that and torched the casts.

who still thinks casts are a good idea? :-)

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

7053c7a5

Change some of the BUFF calls to direct calls to the socket. · 00398293

Ryan Bloom authored Oct 19, 2000


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

00398293

Fix the chemical/x- mime types as suggested in the PR. Or should they · 12611859

Tony Finch authored Oct 19, 2000

be killed?
PR: 4600


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

12611859

Update to the media types as of 2000-10-19. I also fixed the case of · e1748857

Tony Finch authored Oct 19, 2000

application/batch-SMTP to match the official name.
Obtained from:  ftp://ftp.isi.edu/in-notes/iana/assignments/media-types
PR: 6613


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

e1748857

Namespace protect the rest of the macros defined by ap_config.h · bbcb09cd
Ryan Bloom authored Oct 19, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86661 13f79535-47bb-0310-9956-ffa450edef68
```
bbcb09cd

Oct 18, 2000

Support HTTP header line folding with input filtering. · 6e4e3b93

Greg Ames authored Oct 18, 2000

Some funkyness remains with Win32 telnet doing folding - that can wait til
tomorrow.

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

6e4e3b93

Update the STATUS file. · 37e82cb8

Ryan Bloom authored Oct 18, 2000


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

37e82cb8

Add .so and .dll to the application-octect stream mime-type · c4de9e3c

Ryan Bloom authored Oct 18, 2000

Submitted by:	Pier P. Fumagalli <pier@apache.org>


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

c4de9e3c

Get mod_include working again. This still needs to be re-written, but · 3d1725a7

Ryan Bloom authored Oct 18, 2000

at least now we are serving SHTML files again.
PR:	6641


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

3d1725a7

Sub-requests have to have a value for their request_config structure, · 66a3e3b7

Ryan Bloom authored Oct 18, 2000

or we'll seg-fault. This should set the sub-request's request_config
structure to the same exact same structure as the main request is using.

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

66a3e3b7

Set the request config in the new r, not the old r. · 4bf905e9

Jeff Trawick authored Oct 18, 2000


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

4bf905e9

Make the core access the socket directly instead of going through the · 8c0da660

Ryan Bloom authored Oct 18, 2000

BUFF. This doesn't actually change any behavior, it just makes the core
access socket directly.

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

8c0da660

This begins to remove BUFF from the server. The idea is to go very slowly · a143fad1

Ryan Bloom authored Oct 18, 2000

with this. To begin with, we store both the socket and the BUFF in the
conn_rec. Functions are free to use which ever they want, in the end all
of the data goes to the same place. This modifies all of the MPMs except
Windows. All of the Unix MPMs are working, but the others need to be
tested.

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

a143fad1

We have to create the core_request_config structure in the core on internal · e0ff6890

Ryan Bloom authored Oct 18, 2000

redirects. If this isn't done, we'll seg-fault during the AP_DEBUG_ASSERT
that makes sure getline didn't leave any droppings.

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

e0ff6890

apr_psprintf doesn't understand %lld, so we should be using %ld · 03d1b0c3

Ryan Bloom authored Oct 18, 2000

PR:	6653
Submitted by:	 Tomas "�gren" <stric@ing.umu.se>
Reviewed by:	 Ryan Bloom


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

03d1b0c3

· 471911ac

William A. Rowe Jr authored Oct 18, 2000

  That's the end of things broken this morning... now to try Jeff's patch


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

471911ac

ap_get_client_block() now uses a brigade in core_request_config · 4a3ad648

Jeff Trawick authored Oct 18, 2000

instead of a brigade in core_dir_conf. For now, getline() and
ap_get_client_block() share a brigade.

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

4a3ad648

· dcb8d885

William A. Rowe Jr authored Oct 18, 2000

  Fix more broken things


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

dcb8d885

· 641e079c

William A. Rowe Jr authored Oct 18, 2000

  Fix a broken thing


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

641e079c

· 662fcb19

William A. Rowe Jr authored Oct 18, 2000

  expatlib is definately more in sync with the Unix build, so we now
  build the expatlib.dsp rather than seperate xmltok/xmlparse .dsp's.

Submitted by:	Greg Stein
Reviewed by:	William Rowe


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

662fcb19

The final line of the config file was not being read if there was · 8c119a37

Ryan Bloom authored Oct 18, 2000

no \n at the end of it. This was caused by apr_fgets returning
APR_EOF even though we had read valid data. This is solved by
making cfg_getline check the buff that was returned from apr_fgets.
If apr_fgets return APR_EOF, but there was data in the buf, then we
return the buf, otherwise we return NULL.

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

8c119a37

Add a core_request_config so we have a safe semi-hidden place to save core data · 94833318

Greg Ames authored Oct 18, 2000

that lives across function calls during a single request. Change getline() to
take a request_rec parm (rather than a conn_rec) so we can access the
core_request_config.

This is in preparation for adding look-ahead functionality to getline(), so it
can support header line folding once again. I'm committing these changes first
so the core_request_config can be used elsewhere (i.e. ap_get_client_block).

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

94833318

Fix a compile error in mod_rewrite.c. · 47d4ff88

Jeff Trawick authored Oct 18, 2000


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

47d4ff88

Fix piped logs in 2.0. This basically: · 5f3a8a9e

Ryan Bloom authored Oct 18, 2000

1) cleans up an annoying type that was getting in my way while I was
   trying to fix things.
2) Makes some of the allocations pcalloc instead of palloc
3) The arg array passed to create_process is a const *char *, not
   const *char [].
PR:     6642


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

5f3a8a9e

Clarify when [NC] is effective. · 9ec20bc5

Joshua Slive authored Oct 18, 2000


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

9ec20bc5

Restore functionality broken by the mod_rewrite security fix: · 78802fd9

Tony Finch authored Oct 18, 2000

rewrite map lookup keys and default values are now expanded
so that the lookup can depend on the requested URI etc.

Because the new code is recursive you can now write configurations
like the following (with nested map lookups) which wasn't directly
possible before -- you had to use a RewriteCond and a %N backref
instead, as in http://www.apache.org/docs/vhosts/mass.html#xtra-conf

RewriteMap tolower int:tolower
RewriteMap host2user txt:/home/www/conf/virtusertbl
RewriteRule /(.*) /home/${host2user:${tolower:%{HTTP_HOST}}|www}/public_html

PR: 6671


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

78802fd9

Tighten up the syntax checking of Host: headers to fix a · 7b2aa25b

Tony Finch authored Oct 18, 2000

security bug in some mass virtual hosting configurations
that can allow a remote attacker to retrieve some files
on the system that should be inaccessible. The problem
occured with requests including the line "Host: ..." --
the last dot is stripped and the remaining ".." then
reveals a parent directory.

Reported by: Peter Christoffersen <pch@mindpass.com>
Message-ID: <8quts6$2el$1@news.inet.tele.dk>
Newsgroups: comp.infosystems.www.servers.unix


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

7b2aa25b

Oct 17, 2000

Use pool buckets where appropriate. The places I have found so far, are · 5e3aa0ee

Ryan Bloom authored Oct 17, 2000

the buffer_filter, and where the core_filter gets data from the BUFF.


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

5e3aa0ee

Add pool buckets to the bucket list. These buckets are not currently · acfc7b1d

Ryan Bloom authored Oct 17, 2000

used although I have begun to test them on my machine. The idea behind
these buckets is that data allocated out of a pool and put into a bucket
has to survive the death of the pool until the bucket is destroyed. To
accomplish this, we register a cleanup when we create the bucket. If the
pool is cleared, the cleanup converts the bucket to a heap bucket and
everything is good. If the pool isn't cleared, then we kill the cleanup
when the bucket is destroyed.

With this bucket type, all of the core buckets that were listed have been
implemented.

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

acfc7b1d

ap_get_client_block() allocates its brigade from r->pool (as it was · 364ab0c8

Jeff Trawick authored Oct 17, 2000

before today) so that we don't have a growth of these across many
pipelined requests.

http_filter() uses one brigade per connection which it reads into.
As it needs to deliver buckets to the caller, they are removed from
its brigade into the caller's brigade.

Submitted by:	Ryan Bloom (but anything broken is my fault)


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

364ab0c8

Remove brigade_bgets. Getting the chunk header is now done by getline. · 79491f0c
Ryan Bloom authored Oct 17, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86631 13f79535-47bb-0310-9956-ffa450edef68
```
79491f0c

http_filter(): · 2b106a9d

Jeff Trawick authored Oct 17, 2000

  get rid of an unnecessary condition where we set ctx->b to NULL;
  it was already NULL

ap_get_client_block():
  "fix" the pool for the brigade used by ap_get_client_block() to
  save its state; this allows pipelined requests to work


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

2b106a9d