Merge branch 'master' into hpack-exp

Makefile.am

@@ -26,4 +26,4 @@ ACLOCAL_AMFLAGS = -I m4
 
 dist_doc_DATA = README.rst
 
-EXTRA_DIST = shrpx.conf.sample proxy.pac.sample android-config android-make
+EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make

configure.ac

@@ -21,7 +21,7 @@ dnl LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 AC_PREREQ(2.61)
-AC_INIT([nghttp2], [0.1.0-DEV], [t-tujikawa@users.sourceforge.net])
+AC_INIT([nghttp2], [0.1.0], [t-tujikawa@users.sourceforge.net])
 LT_PREREQ([2.2.6])
 LT_INIT()
 dnl See versioning rule:

tests/nghttp2_session_test.c

@@ -3536,7 +3536,8 @@ void test_nghttp2_session_set_option(void)
              NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS,
              &sszval, sizeof(sszval)));
   CU_ASSERT(sszval ==
-            session->remote_settings[NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS]);
+            (ssize_t)session->
+            remote_settings[NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS]);
 
   sszval = 0;
   CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
@@ -3545,12 +3546,12 @@ void test_nghttp2_session_set_option(void)
              NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS,
              &sszval, sizeof(sszval)));
 
-  intval = 100;
+  charval = 100;
   CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
             nghttp2_session_set_option
             (session,
              NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS,
-             &intval, sizeof(intval)));
+             &charval, sizeof(charval)));
 
   nghttp2_session_del(session);
 }