PR:
Obtained from:
Submitted by:
Reviewed by:

  Take a little out... add a little in...


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  More mail from the NetWare front.


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

	Don't force an unconditional setting on the potentially-multivalued
	Cache-Control response field; merge our value into anything already
	there.

PR:	5769


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

	If we're going to use the same routine to create the server and
	directory records, we need to wrap it so the data types match.
	As pointed out by Mike Gardiner.


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

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

PR:
Obtained from:
Submitted by:
Reviewed by:

  *) Add Win32 option -k stop as an alias of -k shutdown, to correspond to
     the NET START/NET STOP syntax.

  *) Force Apache to test the Win32 config prior to any operation,
     except the [-k shutdown -n service] and [-u -n service] combinations.

  *) Add Win32 Ctrl+C/Ctrl+Break/Close/Logoff/Shutdown handler.
     Modified submission by Jan Just Keijser <KEIJSERJJ@logica.com>


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Per Mike - this is replaced with httpd.conf-dist-nw
  History was moved prior to removing this file to the attic.


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

	Fix typo.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Apply the server revision patch from 2.0 to 1.3.13-dev.  Tarball rollers
  no longer need to update src/os/win32/registry.c :-)  Mr. Hansen will be
  fixing the devsite docs to reflect this change.

  Namespace protection (AP_) was discussed, but the half of these symbols
  were already defined, and that would cause a global update we don't want
  to incur in the 1.3.x codebase.


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

	Make the SetEnvIf* and BrowserMatch* diectives usable in
	.htaccess files.

PR:	3000


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Renamed README.NT      to README-WIN.TXT
  Renamed WARNING-NT.TXT to WARNING-WIN.TXT

  in the faint hope that a few more Win95/98 and now 2000 folks will stop
  and actually read the fine print.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

Change some language to move into this century, W2K, anticipated 2.0 etc.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Adding W2K and cleaning up a little language and redundancy.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Markup changes to the esteemed Mr. Engelschall's document to inform and
defer discussion of Windows and NetWare within the context of building
dso binaries.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Add Mark Slemco's observations as a showstopper to permanently close
  this potential security hole.


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

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

PR:
Obtained from:
Submitted by:
Reviewed by:

  I imagine everyone who cares recognizes what this implies.  Absent any
  objections, the patch to bring the 1.3.x tree up to Visual C 6.0 .dsp
  format will be committed on Tuesday night, prior to the 1.3.13 release.

  I strongly suggest, however, that we maintain the 5.0 version .mak,
  since VC 6 will easily recognize it, and the additional features
  offered by the /ZI flag are rather mute for folks who don't work in
  the VisualStudio development environment.  And so, 5.0 .mak files will
  be regenerated and diffs submitted that evening, as a just-in-case.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  The last missing patch, and the details of the June 1st NW patches.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Anyone who doesn't like the target date is welcome to revise it.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Correct bug introduced by today's earlier commit; submitted by Ken Coar.


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

This bug caused directory index to be displayed rather than
returning an error.


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

PR: 1462, 2216, 3645
Obtained from:
Submitted by:	David Whitmarsh <david.whitmarsh@dial.pipex.com>
Reviewed by:	William Rowe

  Applied the __declspec(thread) fix for Win95 so the mod_proxy module
  may be dynamically loaded.  Changed WIN32-specific dll entry point
  function of the patch to MSVC standard DllMain.

  Also expanded the list of PR's that should be closed in r.e. proxy
  bugs fixed by 1.3.13-dev


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Netware port updates to 1.3.13-dev

  Submitted by Mike Gardiner [<MGARDINER@novell.com>]


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  More niceness for folks building Win32 while watching the tree.


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

  Be very clear in the docs that the " is a flag, not a block.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Missed it... see commit comments for changes


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

PR:             1891, 3278, 4139, 5997
Obtained from:  PR 1439
Submitted by:	Michael Friedel <mfriedel@lbell.slctnet.com>
Reviewed by:	William Rowe

  Time for this to go away.  Fixes proxy garbage collection fault in Win32
  due to stat() against directory.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Fix a typo.


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

Submitted by:  Martin Falconer <dipsy@indigo.ie>

Broken link fixed


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

Submitted by: Andy Bach <andy@wiwb.uscourts.gov>


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

	Correct erroneous patches back to accuracy.


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

	Fragment anchors cannot be empty.. at least, not and work reliably.


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

	Add '-n' option to make htpasswd send user:pw result to
	stdout instead of fiddling with a text file.

Reviewed by:	Greg Stein


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

PR: 5509, 5783, 5953, 5903, 5983, 5259, 5515, 5858

Submitted by:	Oliver Wendemuth <owendemuth@ko.hbv.de>


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

	Note a patch for htpasswd..  I'll commit it in a few days if there
	aren't any vetos.


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

	Whoops; fix a link that only works if the server has MultiViews
	enabled for the directory.. which isn't the default.

Submitted by:	Keith Wannamaker <krw@raleigh.ibm.com>
Reviewed by:	Ken Coar


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

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

of Apache 0.6.4 into Shambhala and back again.

Submitted by:	Robert Thau, Roy Fielding


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

filename extensions for the WAP types, as discussed in the "WAP/WML" thread
starting with Message-ID: <391696E0.4D0D6161@Golux.Com>
Obtained from:  ftp://ftp.isi.edu/in-notes/iana/assignments/media-types


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

dispatch table are run. This has been broken since revision 1.1!


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