Commit 78572535 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Forward port 2.4.x change r1810016 

Drops expat LICENSE since this is no longer bundled by apr-util
which is no longer bundled by httpd.

Note text was stale.




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

LICENSE

+0 −43
Original line number Diff line number Diff line
@@ -472,25 +472,6 @@ For the srclib\apr-util\test\testmd4.c component: 
 * documentation and/or software.

 */



For the srclib\apr-util\xml\expat\conftools\install-sh component:



#

# install - install a program, script, or datafile

# This comes from X11R5 (mit/util/scripts/install.sh).

#

# Copyright 1991 by the Massachusetts Institute of Technology

#

# Permission to use, copy, modify, distribute, and sell this software and its

# documentation for any purpose is hereby granted without fee, provided that

# the above copyright notice appear in all copies and that both that

# copyright notice and this permission notice appear in supporting

# documentation, and that the name of M.I.T. not be used in advertising or

# publicity pertaining to distribution of the software without specific,

# written prior permission.  M.I.T. makes no representations about the

# suitability of this software for any purpose.  It is provided "as is"

# without express or implied warranty.

#



For the test\zb.c component:



/*                          ZeusBench V1.01
@@ -520,29 +501,5 @@ Thanks to the following people for their input: 


*/



For the expat xml parser component:



Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd

                               and Clark Cooper



Permission is hereby granted, free of charge, to any person obtaining

a copy of this software and associated documentation files (the

"Software"), to deal in the Software without restriction, including

without limitation the rights to use, copy, modify, merge, publish,

distribute, sublicense, and/or sell copies of the Software, and to

permit persons to whom the Software is furnished to do so, subject to

the following conditions:

	

The above copyright notice and this permission notice shall be included

in all copies or substantial portions of the Software.

	

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.





====================================================================