diff options
author | Daniel Erat <derat@google.com> | 2016-01-04 14:45:16 -0700 |
---|---|---|
committer | Daniel Erat <derat@google.com> | 2016-01-04 14:45:16 -0700 |
commit | f47b11cc8e8e27f27d1772c18f09135a948dd59f (patch) | |
tree | a3c1d564cc73d9f6e92f8ef4506d039816a56575 /websocket/src/test/resources/echo-test.html | |
parent | 12973d7c220d261c3748e3c8051b3ef478cf5b7a (diff) | |
parent | a90fe20374f74dcddbd4b4cddd13e2c23c64e55b (diff) | |
download | nanohttpd-f47b11cc8e8e27f27d1772c18f09135a948dd59f.tar.gz |
Integrate upstream changes to 2.2.0.android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
Merge tag 'nanohttpd-project-2.2.0' from
https://github.com/NanoHttpd/nanohttpd to add HTTPS support.
Bug: 26289868
Change-Id: I6ea26be836ec2682c766127f2fa41f4932557718
Diffstat (limited to 'websocket/src/test/resources/echo-test.html')
-rw-r--r-- | websocket/src/test/resources/echo-test.html | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/websocket/src/test/resources/echo-test.html b/websocket/src/test/resources/echo-test.html index 4b60b80..3f036f2 100644 --- a/websocket/src/test/resources/echo-test.html +++ b/websocket/src/test/resources/echo-test.html @@ -1,3 +1,35 @@ +<!-- + #%L + NanoHttpd-Websocket + %% + Copyright (C) 2012 - 2015 nanohttpd + %% + 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. + + 3. Neither the name of the nanohttpd nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. + #L% + --> <html> <head> <meta charset="utf-8"/> |