merge from trunk r774530

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@774553 13f79535-47bb-0310-9956-ffa450edef68

happy new year

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@731772 13f79535-47bb-0310-9956-ffa450edef68

sync with IANA registry as of 2008 Nov 30 14:17 PST

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@721977 13f79535-47bb-0310-9956-ffa450edef68

protect from mismanaged DNS which return blank/null
hostnames.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@702162 13f79535-47bb-0310-9956-ffa450edef68

note PR fixed ages ago

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@681927 13f79535-47bb-0310-9956-ffa450edef68

note release date

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@657259 13f79535-47bb-0310-9956-ffa450edef68

Merge r652832 from trunk:

Document cvt from V7, not GNU libc, and copyright
Caldera International Inc.

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@652837 13f79535-47bb-0310-9956-ffa450edef68

1.3.42-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@615930 13f79535-47bb-0310-9956-ffa450edef68

update year.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@611957 13f79535-47bb-0310-9956-ffa450edef68

backport the new year ...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@611920 13f79535-47bb-0310-9956-ffa450edef68

bump up - we are now 1.3.42-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@610832 13f79535-47bb-0310-9956-ffa450edef68

Prepare to tag 1.3.41

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@610829 13f79535-47bb-0310-9956-ffa450edef68

Note 1.3.40 was not released

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@610396 13f79535-47bb-0310-9956-ffa450edef68

Note that 1.3.40 was tagged but not released.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@609985 13f79535-47bb-0310-9956-ffa450edef68

Backport mod_status refresh parameter saniziting patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@609486 13f79535-47bb-0310-9956-ffa450edef68

Cast a vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@609454 13f79535-47bb-0310-9956-ffa450edef68

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@609444 13f79535-47bb-0310-9956-ffa450edef68

Propose backport of refresh parameter input sanitizing patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@609410 13f79535-47bb-0310-9956-ffa450edef68

Are we are now 1.3.41-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@608867 13f79535-47bb-0310-9956-ffa450edef68

Prepare to tag 1.3.40

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@608864 13f79535-47bb-0310-9956-ffa450edef68

Update mime.types with IANA registry

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@608255 13f79535-47bb-0310-9956-ffa450edef68

revert move to image/vnd.microsoft.icon because everyone uses image/x-icon

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@608215 13f79535-47bb-0310-9956-ffa450edef68

Fix off-by-one-space underflow.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@603601 13f79535-47bb-0310-9956-ffa450edef68

Fix CVE-2007-5000:

* src/modules/standard/mod_imap.c (menu_header): Fix cross-site
  scripting issue by escaping the URI, and ensure that a charset
  parameter is sent in the content-type to prevent autodetection by
  broken browsers.

Reported by: JPCERT

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@603597 13f79535-47bb-0310-9956-ffa450edef68

Apply Jeff's patch...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@595464 13f79535-47bb-0310-9956-ffa450edef68

SECURITY: CVE-2007-3847 (cve.mitre.org)
mod_proxy: Prevent reading past the end of a buffer when parsing
date-related headers.  PR 41144.

Reviewed by: Eric, JimJag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@590277 13f79535-47bb-0310-9956-ffa450edef68

more verbal description of the fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@589648 13f79535-47bb-0310-9956-ffa450edef68

When setting status to SERVER_DEAD, reset pid as well.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@589602 13f79535-47bb-0310-9956-ffa450edef68

Move to a more efficient pid-table impl. Note that the
change in common_init() will mean that mod_ssl won't cleanly
patch, so before we release, we'll need to make sure they
are aware.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@588214 13f79535-47bb-0310-9956-ffa450edef68

Current STATUS of 1.3.39 binaries: only Netware, mips-siemens-reliantunix5.4 and i386-sinix are built

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@577333 13f79535-47bb-0310-9956-ffa450edef68

Done n gone

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@575751 13f79535-47bb-0310-9956-ffa450edef68

Bump for 1.3.40

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@572654 13f79535-47bb-0310-9956-ffa450edef68

get ready to tag 1.3.39

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@572647 13f79535-47bb-0310-9956-ffa450edef68

Note plan for TR

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@571922 13f79535-47bb-0310-9956-ffa450edef68

Sync with mime.types rev 571614

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@571619 13f79535-47bb-0310-9956-ffa450edef68

Fix typo in Japanese docs reference.
PR: 43233
Submitted by: IIDA Yosiaki <y-iida@secom.co.jp>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@571270 13f79535-47bb-0310-9956-ffa450edef68

Reprocess .png's as transparent (w/ GraphicsMagic since my local
copy of ImageMagic creates garbage transparent .png's).

PR: 30190
Backport: r570373

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@570377 13f79535-47bb-0310-9956-ffa450edef68

Update for the docs-project, and illustrate the icons on both white
and black backgrounds (to point out PR 30190).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@570372 13f79535-47bb-0310-9956-ffa450edef68

Documented in the parent directory

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@570367 13f79535-47bb-0310-9956-ffa450edef68

note mime.types update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@570222 13f79535-47bb-0310-9956-ffa450edef68

backport from trunk (r570206)

Sync with IANA registry.

Update common x-types that have been registered or will never
be registered for compatibility reasons.  Yeah, those x-Idiots.

The extensions recently assigned to application/vnd.apple.installer+xml
(dist distz pkg mpkg) are too numerous and too generic.  We should
always assume that vendors are too lazy to check for conflicts
(we choose .mpkg only, since that is the common one).

The extension recently assigned to ecmascript (.es)
interferes with languages (espanol), so replace with .ecma.
PR: 35550

Assign the .chm extension to the newly registered type based on
the theory that Microsoft will use it eventually.
PR: 37798

Add application/xspf+xml xspf since they are trying to do it right.
PR: 39317

Add svgz to list of image/svg+xml extensions as per W3C.
PR: 31483

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@570211 13f79535-47bb-0310-9956-ffa450edef68

Are we are now working on 1.3.39-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@564627 13f79535-47bb-0310-9956-ffa450edef68

We are tagging 1.3.38

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@564624 13f79535-47bb-0310-9956-ffa450edef68

Note proposed schedule.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@562731 13f79535-47bb-0310-9956-ffa450edef68

FreeBSD 6

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@562230 13f79535-47bb-0310-9956-ffa450edef68

Fix section match.

PR: 33466

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@561440 13f79535-47bb-0310-9956-ffa450edef68

SECURITY: CVE-2006-5752 (cve.mitre.org)
mod_status: Fix a possible XSS attack against a site with a public
server-status page and ExtendedStatus enabled, for browsers which
perform charset "detection".  Reported by Stefan Esser.  [Joe Orton]

Joe's patch was tweaked ever so slightly by me, then reviewed
by Joe and Sander T.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@559142 13f79535-47bb-0310-9956-ffa450edef68

Note pid table changes: SECURITY: CVE-2007-3304 (cve.mitre.org)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@553551 13f79535-47bb-0310-9956-ffa450edef68

Add '*.a' to svn:ignore to ignore library archives.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@553239 13f79535-47bb-0310-9956-ffa450edef68

* It does not matter if this pid is still in the scoreboard or not. We need to
  remove it from our pid table in any case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@544218 13f79535-47bb-0310-9956-ffa450edef68

Only remove from pid table when we've reaped a child,
that is, when we know it's gone.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@544149 13f79535-47bb-0310-9956-ffa450edef68

Use ap_snprintf()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@544148 13f79535-47bb-0310-9956-ffa450edef68

Some comments... Yes, a 64 char array is overkill, but so
what :) Also, in this section we later on unset as well,
but also encapsulate the logic here as well.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@543663 13f79535-47bb-0310-9956-ffa450edef68

more cleanus of pid_table for killed/waited-for kiddies

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@543634 13f79535-47bb-0310-9956-ffa450edef68

Add in parent process PID table, to provide for
a check against the pid values located in the
scoreboard.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@543511 13f79535-47bb-0310-9956-ffa450edef68

Properly null-terminate the tpf_server_name string (in TPF-only code).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@543050 13f79535-47bb-0310-9956-ffa450edef68

port r532162 to the 1.3.x stable branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@533996 13f79535-47bb-0310-9956-ffa450edef68

moved XLFLAGS to the .opt file so that external libs can be added;
added new var XDCDATA and removed xdcdata setting from mis-used XLFLAGS;
moved some copyright from .opt to .def file since -copy option doesnt accept commas.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@531666 13f79535-47bb-0310-9956-ffa450edef68

Backport Order fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@522952 13f79535-47bb-0310-9956-ffa450edef68

About time to note this

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@495144 13f79535-47bb-0310-9956-ffa450edef68

Tweak Allow/Deny tagging.
Tweak tense.
Update Allow/Deny match table.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@479902 13f79535-47bb-0310-9956-ffa450edef68

Reword Order section to make 3-pass design clearer.
Add table showing results of match combinations.
Fix some tenses.
Fix case of CENTER & IP Address.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@479297 13f79535-47bb-0310-9956-ffa450edef68

Incorporated feedback from the TPF Users Group conference.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@432760 13f79535-47bb-0310-9956-ffa450edef68

The Expect header XSS got a CVE name as it was proved you can influence the
header if a user visits a site holding a malicious flash file.
IMO this is a flash flaw, but mark as security for future reference, although
only for 1.3.  2.0 and 2.2 both need to timeout before any XSS happens
reducing the risk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@427039 13f79535-47bb-0310-9956-ffa450edef68

  Rebump after retag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@426185 13f79535-47bb-0310-9956-ffa450edef68

  Revert, missed one change to APACHE_RELEASE bit

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@426181 13f79535-47bb-0310-9956-ffa450edef68

  Bump after tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@426170 13f79535-47bb-0310-9956-ffa450edef68

  Prepare to tag 1.3.37

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@426166 13f79535-47bb-0310-9956-ffa450edef68

  Wrong project name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@426162 13f79535-47bb-0310-9956-ffa450edef68

SECURITY: CVE-2006-3747 (cve.mitre.org)
mod_rewrite: Fix an off-by-one security problem in the ldap scheme
handling.  For some RewriteRules this could lead to a pointer being
written out of bounds.  Reported by Mark Dowd of McAfee.

Reviewed by: trawick, lars, jorton, wrowe, benl

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@426146 13f79535-47bb-0310-9956-ffa450edef68

  Official home is http://svn.apache.org/repos/asf/httpd/httpd/dist/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@426108 13f79535-47bb-0310-9956-ffa450edef68

update license header text

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@421184 13f79535-47bb-0310-9956-ffa450edef68

update according to board resolution

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@421131 13f79535-47bb-0310-9956-ffa450edef68

And we are now 1.3.37-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@406324 13f79535-47bb-0310-9956-ffa450edef68

Get ready to tag 1.3.36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@406321 13f79535-47bb-0310-9956-ffa450edef68

Note intent to T&R 1.3.36 this Friday

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@405423 13f79535-47bb-0310-9956-ffa450edef68

Back out 396294. This keeps HEAD in a non-regression state
and allows us to re-add/fix the functionality "later on"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@405142 13f79535-47bb-0310-9956-ffa450edef68

And we are announced/released

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@398586 13f79535-47bb-0310-9956-ffa450edef68

And bump to 1.3.36-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@396613 13f79535-47bb-0310-9956-ffa450edef68

Stand by for tagging

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@396606 13f79535-47bb-0310-9956-ffa450edef68

Fix up some version numbers

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@396604 13f79535-47bb-0310-9956-ffa450edef68

Work on announcement

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@396531 13f79535-47bb-0310-9956-ffa450edef68

  * Backport the include directive patch for 1.3

  * Add a changelog entry for same

  * reorder the changelog to put security first.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@396294 13f79535-47bb-0310-9956-ffa450edef68

Revert copyright date change patch. Wait until we have
a universal policy and procedure... we cannot willy
nilly change the dates unless significant or
material changes are made.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395984 13f79535-47bb-0310-9956-ffa450edef68

Recast a vote...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395929 13f79535-47bb-0310-9956-ffa450edef68

Ask a question, since I'm lazy until tomorrow :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395401 13f79535-47bb-0310-9956-ffa450edef68

Add a note on why the fprintf's are there

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395297 13f79535-47bb-0310-9956-ffa450edef68

Note the proposed T/R and cast vote. If the fprintfs
were removed, or somehow configurable, I'd switch to +1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395291 13f79535-47bb-0310-9956-ffa450edef68

Update to 2006

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395246 13f79535-47bb-0310-9956-ffa450edef68

Fix escaping of Expect error message
http://svn.apache.org/viewcvs?rev=394965&view=rev
+1: mjc, trawick, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395171 13f79535-47bb-0310-9956-ffa450edef68

  Vote, vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395129 13f79535-47bb-0310-9956-ffa450edef68

  Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395127 13f79535-47bb-0310-9956-ffa450edef68

What the hell, include a proposal to incorporate my 4 year old patch to my own
personal favourite most annoying 1.3 bug.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@395076 13f79535-47bb-0310-9956-ffa450edef68

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@394991 13f79535-47bb-0310-9956-ffa450edef68

Unsure if acks are needed for 1.3 branch, but it can't hurt, add
the expect header issue

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@394969 13f79535-47bb-0310-9956-ffa450edef68

TPF platform-specific changes:
   Ensure children close their sockets upon shutdown.
   Fix KeepAliveTimeOut and TimeOut processing.
   Implement SIGUSR1 (graceful restart) and SIGHUP (restart now).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@381696 13f79535-47bb-0310-9956-ffa450edef68

Use ap_assert instead of assert in mod_log_forensic.

This fixes issue #38177.

* src/modules/standard/mod_log_forensic.c
  (log_escape, log_before): s/assert/ap_assert/

Noticed by: Wilson Cheung <wcheung ucsd.edu>
Patch by: Jim Jagielski
Approved by: Jeff Trawick, André Malo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@367914 13f79535-47bb-0310-9956-ffa450edef68

Fixed broken apache_pb.gif link as pointed out
by Anthony Anderberg <ant@hutchtel.net>.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@366325 13f79535-47bb-0310-9956-ffa450edef68

  Backport, even to 1.3, the ability to build under devenv
  of Visual Studio 2005.  Endorse -f syntax to get folks
  used to portable make semantics

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@357229 13f79535-47bb-0310-9956-ffa450edef68

Fix moderate security issue CVE-2005-3352 mod_imap cross-site scripting flaw

Submitted by: Mark Cox <mjc apache.org>
Reviewed by: jorton, mjc, fielding
PR: 37874

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@356278 13f79535-47bb-0310-9956-ffa450edef68