Checkout Tools
  • last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Clean up more dead httpd branches that we don't intend to use.

Add lockfile name to error message printed out when

USE_FLOCK_SERIALIZED_ACCEPT is defined.

Reviewed by:

Submitted by:

Obtained from:

Prepare for final release.

Enhanced the chunking and error handling inside the buffer functions.

This also reduces the pause on transfers under certain conditions.

Submitted by: Dean Gaudet, Roy Fielding

Reviewed by: Dean Gaudet, Roy Fielding, Ralf S. Engelschall

    • -30
    • +44
    ./APACHE_1_2_X/src/main/buff.c
Set correct version number for first snapshot and coming release.

Yep I managed to post it screwed up ... and probably because I wrote

so much with the patch to PR#717 everyone agreed with the concept without

reviewing the code!

Correct a few of my changes.

Fixed improper vhost merging of <Location> and <Directory>.

Submitted by: Dean Gaudet

Reviewed by: Roy Fielding, Ralf S. Engelschall, Dean Gaudet

Really fix solaris -HUP problem with slack dup of sockets. Undo prior

change and move ap_slack after all of the rest of the socket initialization,

which apparently is needed for SO_REUSEADDR to survive the dup on Solaris.

Also block SIGHUP and SIGUSR1 during restart on all platforms.

PR: 832

Submitted by: Dean Gaudet

Reviewed by: Roy Fielding

    • -33
    • +35
    ./APACHE_1_2_X/src/main/http_main.c
Merged in recent changes from HEAD.

    • -31
    • +40
    ./APACHE_1_2_X/htdocs/manual/misc/FAQ.html
Bugfix the case where multiple <Directory>s match and all are applied

Submitted by: Dean Gaudet

Reviewed by: Dean Gaudet, Ralf S. Engelschall, Randy Terbush

    • -1
    • +2
    ./APACHE_1_2_X/src/main/http_request.c
Make headers also consistent in Apache 1.2.2 docs.

    • -1
    • +1
    ./APACHE_1_2_X/htdocs/manual/mod/mod_browser.html
    • -1
    • +1
    ./APACHE_1_2_X/htdocs/manual/mod/mod_cern_meta.html
    • -1
    • +1
    ./APACHE_1_2_X/htdocs/manual/mod/mod_headers.html
    • -1
    • +1
    ./APACHE_1_2_X/htdocs/manual/mod/mod_env.html
    • -1
    • +1
    ./APACHE_1_2_X/htdocs/manual/mod/mod_proxy.html
Merged in from HEAD.

    • -4
    • +4
    ./APACHE_1_2_X/ABOUT_APACHE
Fixed an infinite loop for references above the server root.

PR: 748

Submitted by: Dean Gaudet

Reviewed by: Brian Behlendorf

    • -0
    • +4
    ./APACHE_1_2_X/src/modules/standard/mod_imap.c
Merge in documentation update from HEAD.

    • -58
    • +120
    ./APACHE_1_2_X/htdocs/manual/mod/mod_rewrite.html
Merging in changes from HEAD.

merge in Ken's recent FAQ changes from HEAD

    • -54
    • +100
    ./APACHE_1_2_X/htdocs/manual/misc/FAQ.html
handle_else was being used to handle endif.

Submitted by: Howard Fear

Reviewed by: Ralf S. Engelschall, Jim Jagielski, Randy Terbush

Final sync of mod_rewrite for Apache 1.2.2:

o added diff between mod_rewrite 3.0.6+ and 3.0.9

minus WIN32/NT stuff, but plus copyright removement.

In detail:

- workaround for detecting infinite rewriting loops

- fixed setting of env vars when "-" is used as subst string

- fixed forced response code on redirects (PR#777)

- fixed cases where r->args is ""

- kludge to disable locking on pipes under braindead SunOS

- fix for rewritelog in cases where remote hostname is unknown

- fixed totally damaged request_rec walk-back loop

o remove static from local data and add static to global ones.

o replaced ugly proxy finding stuff by simple

find_linked_module("mod_proxy") call.

o added missing negation char on rewritelog()

o fixed a few comment typos

PR: 777

Submitted by: Ralf S. Engelschall

Reviewed by: Jim Jagielski, Randy Terbush, Ralf S. Engelschall

    • -9
    • +12
    ./APACHE_1_2_X/src/modules/standard/mod_rewrite.h
    • -43
    • +72
    ./APACHE_1_2_X/src/modules/standard/mod_rewrite.c
mod_auth_anon logs multiple times

PR: 421, 868

Submitted by: Dean Gaudet

Reviewed by: Ralf S. Engelschall, Dirk v.Gulik, Ken Coar, Jim Jagielski

    • -1
    • +1
    ./APACHE_1_2_X/src/modules/standard/mod_auth_anon.c
"force-response-1.0" now only applies to requests which are HTTP/1.0 to begin

with. "nokeepalive" now works for HTTP/1.1 clients. Added "downgrade-1.0"

which causes Apache to pretend it received a 1.0. Additionally mod_browser

now triggers during translate_name to workaround a deficiency in the

header_parse phase.

PR: 875

Submitted by: Dean Gaudet

Reviewed by: Roy Fielding, Ralf S. Engelschall, Jim Jagielski

    • -4
    • +4
    ./APACHE_1_2_X/src/mod_browser.c
    • -6
    • +9
    ./APACHE_1_2_X/src/main/http_protocol.c
    • -0
    • +4
    ./APACHE_1_2_X/src/main/http_request.c
get_client_block() returns wrong length if policy is REQUEST_CHUNKED_DECHUNK

PR: 815

Submitted by: Kenichi Hori <ken@d2.bs1.fc.nec.co.jp>

Reviewed by: Dean Gaudet, Ralf S. Engelschall, Jim Jagielski

    • -1
    • +5
    ./APACHE_1_2_X/src/main/http_protocol.c
Treat <files> container like others in mod_info.

PR: 848

Submitted by: Marc Slemko

Reviewed by: Dean Gaudet, Ralf S. Engelschall, Ken Coar, Jim Jagielski

    • -4
    • +9
    ./APACHE_1_2_X/src/modules/standard/mod_info.c
merge up to 1.3 base

    • -3
    • +243
    ./APACHE_1_2_X/htdocs/manual/misc/FAQ.html
merge up to 1.3 docs

    • -15
    • +15
    ./APACHE_1_2_X/htdocs/manual/mod/mod_proxy.html
This commit was manufactured by cvs2svn to create branch 'APACHE_1_2_X'.
Note the fixes for PR#813, 814.

First problem: if a client sends a Host: header with a different case than

"Host:", the proxy won't see it and it will end up with two Host: headers

with different capitalization.

Second problem: if the proxy connects to a HTTP/0.9 server, the

first line returned will be corrupt because len was tampered with.

Reviewed by: Marc Slemko, Dean Gaudet, Randy Terbush

Submitted by: Kenichi Hori <ken@d2.bs1.fc.nec.co.jp>

PR: 813, 814

    • -5
    • +3
    ./APACHE_1_2_X/src/modules/proxy/proxy_http.c
More updates from 1.3 docs.

    • -2
    • +7
    ./APACHE_1_2_X/htdocs/manual/misc/known_bugs.html
Bring in doc changes from 1.3.