Merge branch 'master' into hpack-exp

This commit is contained in:
Tatsuhiro Tsujikawa 2013-10-28 23:15:14 +09:00
commit 2dd44746a6
3 changed files with 6 additions and 5 deletions

View File

@ -26,4 +26,4 @@ ACLOCAL_AMFLAGS = -I m4
dist_doc_DATA = README.rst 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

View File

@ -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 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. dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AC_PREREQ(2.61) 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_PREREQ([2.2.6])
LT_INIT() LT_INIT()
dnl See versioning rule: dnl See versioning rule:

View File

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