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

30 Jan, 2002 20 commits

Of course, more wildcard characters · e126a6b9

Martin Kraemer authored Jan 30, 2002


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

e126a6b9

Describe the proxy_ftp changes: · 9c788450

Martin Kraemer authored Jan 30, 2002

FTP directory listings are now always retrieved in ASCII mode.
The FTP proxy properly escapes URI's and HTML in the generated
listing, and escapes the path components when talking to the FTP
server. It is now possible to browse the root directory by using
a url like:   ftp://user@host/%2f/ (ported from apache_1.3.24)
Also, the last path component may contain wildcard characters
'*' and '?', and if they do, a directory listing is created instead
of a file retrieval. Example: ftp://user@host/httpd/server/*.c


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

9c788450

Port the "squid %2f hack" from apache_1.3.24. · 5a039b34

Martin Kraemer authored Jan 30, 2002

It is now possible to browse the root directory by using a url
like:   ftp://user@host/%2f/
Also, the last path component may contain wildcard characters
'*' and '?', and if they do, a directory listing is created instead
of a file retrieval. Example: ftp://user@host/httpd/server/*.c


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

5a039b34

Oops, sorry. Lost one line. · ad488726

Martin Kraemer authored Jan 30, 2002


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

ad488726

Something sets the content_encoding, even if a directory listing · 75646c09

Martin Kraemer authored Jan 30, 2002

is going to be returned. Hack: unset the content_encoding if
dirlisting == TRUE.

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

75646c09

For the ftp commands CWD and RETR, do escaping for the path elements, · e2f102d7

Martin Kraemer authored Jan 30, 2002

because FTP servers do globbing, which we do not want for filenames
from the directory listing.
PR:
Obtained from:
Submitted by:
Reviewed by:


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

e2f102d7

· 6996bd4d

William A. Rowe Jr authored Jan 30, 2002

  Fix nmake -f makefile.win clean on win32.


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

6996bd4d

In the debug log, say 'decline' instead of 'reject' when DECLINEing · e5f53314
Martin Kraemer authored Jan 30, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93103 13f79535-47bb-0310-9956-ffa450edef68
```
e5f53314

Remove more spmt_os2 MPM leftovers. · d5b15c87

Brian Havard authored Jan 30, 2002


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

d5b15c87

get rid of a bunch of warnings about unused variables · 9ed4836b

Jeff Trawick authored Jan 30, 2002


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

9ed4836b

zap a warning on AIX... given that time_t isn't an APR construct · 0eb150c8

Jeff Trawick authored Jan 30, 2002

I don't know of a better fix


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

0eb150c8

Oops: wrong variable · 8a995ef0

Martin Kraemer authored Jan 30, 2002


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

8a995ef0

Simplify the complexity by using a common proxy_ftp_command() routine. · a44e22c4

Martin Kraemer authored Jan 30, 2002

Strip the ";type=X" suffix from the header generated in dir listings.
Set type to ASCII for directory listings. Use common get_PWD() routine.

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

a44e22c4

Updated to support the use of the ap_mpm_pod API in worker · 0b7c760c

Brian Pane authored Jan 30, 2002


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

0b7c760c

Added logic to the worker MPM to skip the poll before accept · 22da7175

Brian Pane authored Jan 30, 2002

if there's only one listener socket (based on the implementation
in the prefork MPM). This also enables us to do single-listener
unserialized accept

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

22da7175

· 9410fb92

William A. Rowe Jr authored Jan 30, 2002

  Need the long name of the build model for ssl/abs (e.g. Release/Debug).


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

9410fb92

make it compile on win32 · 33640e45

Ian Holsman authored Jan 30, 2002


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

33640e45

Cleanup some fallout from the recent install_transport_filters commit. · b95c0957

Bill Stoddard authored Jan 30, 2002

Deprecate ap_proxy_pre_http_connection.


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

b95c0957

Simplify the exit paths of ap_rgetline by creating a second brigade for · baab885f

Justin Erenkrantz authored Jan 30, 2002

use when we do AP_MODE_SPECULATIVE.  This allows us to delete the
brigades earlier.

(In practice, it really doesn't matter if we delete the brigade or not
since it will be destroyed when it's pool is destroyed, but we'll try
to be nice.)


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

baab885f

Now how did this slip by. Fixes a segfault. I tested this code, really... · 9ce109bf
Bill Stoddard authored Jan 30, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93091 13f79535-47bb-0310-9956-ffa450edef68
```
9ce109bf

29 Jan, 2002 20 commits

get prefork to build again. · 2a4b2b4b

Greg Ames authored Jan 29, 2002


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

2a4b2b4b

new directive 'ProxyPreserveHost' which allows the incoming host line to · 6ed60dd1

Ian Holsman authored Jan 29, 2002

be sent to the proxied server.

Submitted by:	g.russell@ieee.org (1.3 version)
Reviewed by:	Ian Holsman/Graham Legget/Chuck Murcko


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

6ed60dd1

just make it a bit more explicit · 861817dd

Ian Holsman authored Jan 29, 2002


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

861817dd

This patch restores most of Ryan's patch (11/12/2001) to remove the · 2192a49d

Bill Stoddard authored Jan 29, 2002

client_socket from the conn_rec.  Diffs from Ryan's patch include:

- rename the create_connection hook to install_transport_filters
- move the point of invocation of the hook till after the call to
  after ap_update_vhost_given_ip to enable the hook to use vhost
  config info in its decision making.


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

2192a49d

configuration change. · d71dbcbc

Ian Holsman authored Jan 29, 2002

allow a '!' directive to stop proxying these requests
eg.

  ProxyPass /services/images/     !
  ProxyPass /services/            http://service-machine/services/

which will stop requests to /services/images/ from being proxied

Submitted by:	Jukka Pihl <jukka.pihl@entirem.com>
Reviewed by:	Ian Holsman, Graham Legget, Chuck Murcko


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

d71dbcbc

· bab8bc6a

William A. Rowe Jr authored Jan 29, 2002

BuildBin never made it to this home. Makefile.win got lost, since it
would have been invoked from another path, trying to validate that the
apr and apr-util repositories had been checked out. Too much trouble :)

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

bab8bc6a

· 6d4a59dc

William A. Rowe Jr authored Jan 29, 2002

  Move the _tryssl targets across to the BuildBin target


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

6d4a59dc

· 93a791fc

William A. Rowe Jr authored Jan 29, 2002

  Trust MS to manage it's project.


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

93a791fc

· cdbb3ff6

William A. Rowe Jr authored Jan 29, 2002

By popular demand and some of my own observations - here is a build
target one can use as a dummy, without 'installing binaries'. Now
Win32's makefile.win will simply kick off BuildBin and let it fire
off all the targets from a command line build. This will help to
resolve some of the misses on incremental builds.

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

cdbb3ff6

If the ftp proxy could not guess the output format of the ftp server's · 9eb720f4

Martin Kraemer authored Jan 29, 2002

directory listing, it makes another attempt: it tries a format similar to
the output of "ls -s1" (optional whitespace followed by size, followed by
whitespace, followed by filename, where filename may contain no more whitespace).
This format works at least with one FTP server for which previously only
the (non-clickable) output was displayed.

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

9eb720f4

· 0fbee207

William A. Rowe Jr authored Jan 29, 2002

Many of our platform's apr_dir_read() aren't returning APR_FINFO_TYPE,
so we will take the long way through (and the long way for LNK's as well.)

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

0fbee207

· c230edd0

William A. Rowe Jr authored Jan 29, 2002

Prepare for some changes to the .dsw - phase 1.

Add /USEENV for msdev so the user with awk.exe in the path can resolve.

Add _dummy: for a new compile-all target.

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

c230edd0

Fix handling of \r\n at the end of FTP directory listings (\r characters · e01f83ea

Martin Kraemer authored Jan 29, 2002

were left in the output and would create additional line breaks in most
browsers)

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

e01f83ea

For NoProxy connections (when no backend->connection is needed), a NULL · 745a7b50

Martin Kraemer authored Jan 29, 2002

pointer would be dereferenced. Check it more thoroughly.


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

745a7b50

ScriptAlias requires mod_cgi · bdbe3207

Joshua Slive authored Jan 29, 2002

Submitted by:	TD - Sales International Holland B.V. <td@salesint.com>


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

bdbe3207

* Prefer compatibility with both HTML-4 and XHTML (rather than XHTML only) · 90ee0fa1

Martin Kraemer authored Jan 29, 2002

* Properly escape URIs and HTML in the FTP filename list
* Avoid a pointer underrun


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

90ee0fa1

Add some more apr_ types · 365cab14

Martin Kraemer authored Jan 29, 2002


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

365cab14

const is nice · fe011001

Jeff Trawick authored Jan 29, 2002


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

fe011001

No need to use strcpy() where a ptr assignment is ok · 91ab2da0

Martin Kraemer authored Jan 29, 2002


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

91ab2da0

Don't let the default handler try to serve a raw directory. At · 72265f62

Jeff Trawick authored Jan 29, 2002

best you get gibberish.  Much worse things can happen depending
on the OS.

This can happen when autoindex isn't loaded.

On AIX, I had a directory file which was reported to be 1536 bytes
in size.  mmap() failed so we went to the fall-back logic.
The first read() got 624 bytes and the next read() got 0
(supposedly EOF).  This confused us greatly, we kept allocating
buffers and reading and exercised the paging space.

Reviewed by:  Bill Rowe


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

72265f62