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

29 Jan, 2002 23 commits

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

Take advantage of the new pre_config return value when apr_proc_detach · 95a1ed9c

Aaron Bannert authored Jan 29, 2002

fails. I'll be making some changes to apr_proc_detach, and it will be
nice to be able to report runtime errors.

Tested on worker but the code changes are identical on other MPMs.

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

95a1ed9c

Added MOD_Auth_Digest to the build project · 1090a5d0

Bradley Nicholes authored Jan 29, 2002


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

1090a5d0

Added some type casting to the appropriate types to avoid type mismatches · 9d1d2e53

Bradley Nicholes authored Jan 29, 2002

on the CodeWarrior compiler


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

9d1d2e53

I think this was supposed to have been bumped a couple times since · f7ca82ca

Aaron Bannert authored Jan 29, 2002

the 14th, and was perhaps forgotten about? In any case, it needs to
be bumped now -- pre_config hook return type has changed.

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

f7ca82ca

28 Jan, 2002 10 commits

Mention the pre_config prototype change, and fix some grammar. · 1272ae50
Aaron Bannert authored Jan 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93064 13f79535-47bb-0310-9956-ffa450edef68
```
1272ae50

The pre_config hook now takes a return value. This allows modules to · 0124210f

Aaron Bannert authored Jan 28, 2002

cause the server to bail out under error conditions.


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

0124210f

backing out fix for missing path info and query string. wrowe beat me to · d8ea3e87
Greg Ames authored Jan 28, 2002
```
it.


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

handle_multi: pass along the original path info and query string if · 82af1e84

Greg Ames authored Jan 28, 2002

we redirect due to negotiation

pointed out by: Bill Rowe

also, clarify what some code in handle_map_file is doing


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

82af1e84

Fix some unix socket descriptor leaks in the handler side of · 37ffebb0

Jeff Trawick authored Jan 28, 2002

mod_cgid (the part that runs in the server process). Whack a
silly "close(-1)" in the handler too.

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

37ffebb0

First step: send proxy_ftp.c thru · 914c7321

Martin Kraemer authored Jan 28, 2002

  indent | pr -e8 -t
(no other changes)


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

914c7321

Update --with-mpm help text wrt available OS/2 MPM name. · 697a8405

Brian Havard authored Jan 28, 2002


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

697a8405

zap an unintended (and incorrect) comment that slipped in with · 843ef8d8

Jeff Trawick authored Jan 28, 2002

the last commit; sorry!


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

843ef8d8

some level of gcc seems to be confused about whether or not · 9caa92c3

Jeff Trawick authored Jan 28, 2002

b is used before being set; shut it up


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

9caa92c3

fix the problem where a scoreboard init failure could leave · 9c3870e3

Jeff Trawick authored Jan 28, 2002

mod_cgid stranded

a pre_mpm hook can now return failures, so problems in
ap_create_scoreboard percolate back to a place where Apache
can exit cleanly


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

9c3870e3

27 Jan, 2002 7 commits

optimized away one more filter name lookup during request processing · 505bbe75
Brian Pane authored Jan 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93052 13f79535-47bb-0310-9956-ffa450edef68
```
505bbe75

Replaced some more ap_add_output_filter() calls with · fc755451

Brian Pane authored Jan 27, 2002

ap_add_output_filter_handle() for efficiency


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

fc755451

Remove the create_connection hook and put the client_socket back into the · d5c229c0

Bill Stoddard authored Jan 27, 2002

conn_rec. The create_connection_hook has a design flaw that prevents it
from making decisions based on vhost information.

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

d5c229c0

APR might not return everything we're asking for. Let that slide... · 31345365

Greg Stein authored Jan 27, 2002

Submitted by: Kenny Sy <itc_kennysy@hotmail.com>


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

31345365

Added a note about potential performance improvements for the · e0bed2f0

Brian Pane authored Jan 27, 2002

worker MPM


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

e0bed2f0

· 258c96e9

William A. Rowe Jr authored Jan 27, 2002

Whoops - this patch is required by the last request.c change.

Fulfills Brian Pane's suggestion that we always overallocate by one
to make /foo/bar quickly convertable to /foo/bar/

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

258c96e9

· 1eb3bfbb

William A. Rowe Jr authored Jan 27, 2002

Shortcut where the resource has no language [discovered with no
DefaultLanguage in cgi-bin, resolving Greg Ames' observations, we
had a lurking segfault.]

This begs the question, what exactly did the fn do with no language
in terms of serving content back in 1.3. Should be reviewed.

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

1eb3bfbb