Permalink
Browse files

now we use the 2-clause bsd license.

  • Loading branch information...
1 parent 8bd248f commit 592845e9047c6a6f8fd79c8fdfc927581373f24b @agentzh agentzh committed Dec 17, 2010
Showing with 1 addition and 5 deletions.
  1. +0 −4 README
  2. +1 −1 util/build.sh
View
4 README
@@ -391,10 +391,6 @@ Copyright & License
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- * Neither the name of the Taobao Inc. 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
View
@@ -26,9 +26,9 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$
--add-module=$root/../eval-nginx-module \
--add-module=$root/../echo-nginx-module \
--add-module=$root $opts \
- --add-module=$root/../ndk-nginx-module \
--with-debug \
|| exit 1
+ #--add-module=$root/../ndk-nginx-module \
#--without-http_ssi_module # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
fi

0 comments on commit 592845e

Please sign in to comment.