summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-09-20 03:16:03 +0000
committerkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-09-20 03:16:03 +0000
commit9cc5fe61a364783ada31e06516f84ad37d7c5ee5 (patch)
tree0c8452ab1eea2968b333632279d3183c42807662
parent350a0a2fd8f6f971483c88c4688e001ce0371cba (diff)
downloadATCD-9cc5fe61a364783ada31e06516f84ad37d7c5ee5.tar.gz
ChangeLogTag: Thu Sep 19 22:13:13 2002 Krishnakumar B <kitty@cs.wustl.edu>
-rw-r--r--ACEXML/common/HttpCharStream.cpp26
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLogs/ChangeLog-03a8
3 files changed, 40 insertions, 2 deletions
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index b6a1e1b2a51..fccd250d03c 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -71,6 +71,32 @@ ACEXML_HttpCharStream::open (const ACEXML_Char *url)
return 0;
}
+// The FSM was taken from the implementation of http_get and that falls
+// under the following license:
+//
+// Copyrigh (c) 2000 by Jef Poskanzer <jef@acme.com>. All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE.
+
int
ACEXML_HttpCharStream::get_url (size_t& len)
diff --git a/ChangeLog b/ChangeLog
index 40c7e3de811..80d4e356fcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 19 22:13:13 2002 Krishnakumar B <kitty@cs.wustl.edu>
+
+ * ACEXML/common/HttpCharStream.cpp: Added license for the FSM in
+ HttpCharStream.cpp. It is a shortened BSD license which is
+ compatible with ACE/TAO licensing.
+
Wed Sep 18 12:26:22 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* examples/Misc/test_trace.cpp: The call to activate() was
@@ -18,7 +24,7 @@ Tue Sep 17 17:26:40 2002 Ossama Othman <ossama@uci.edu>
Tue Sep 17 01:35:54 UTC 2002 Don Hinton <dhinton@ieee.org>
- * ace/OS.h: Remove redundant MAXPATHLEN definition when
+ * ace/OS.h: Remove redundant MAXPATHLEN definition when
building VxWorks. Thanks to Rob Andzik <andzik@rtlogic.com>
for pointing this out.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 40c7e3de811..80d4e356fcc 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Thu Sep 19 22:13:13 2002 Krishnakumar B <kitty@cs.wustl.edu>
+
+ * ACEXML/common/HttpCharStream.cpp: Added license for the FSM in
+ HttpCharStream.cpp. It is a shortened BSD license which is
+ compatible with ACE/TAO licensing.
+
Wed Sep 18 12:26:22 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* examples/Misc/test_trace.cpp: The call to activate() was
@@ -18,7 +24,7 @@ Tue Sep 17 17:26:40 2002 Ossama Othman <ossama@uci.edu>
Tue Sep 17 01:35:54 UTC 2002 Don Hinton <dhinton@ieee.org>
- * ace/OS.h: Remove redundant MAXPATHLEN definition when
+ * ace/OS.h: Remove redundant MAXPATHLEN definition when
building VxWorks. Thanks to Rob Andzik <andzik@rtlogic.com>
for pointing this out.