http2: additional refinement of stream/session

configure

@@ -394,10 +394,15 @@ intl_optgroup.add_option('--download-path',
 
 parser.add_option_group(intl_optgroup)
 
+http2_optgroup.add_option('--debug-http2',
+    action='store_true',
+    dest='debug_http2',
+    help='build with http2 debug statements on (default is false)')
+
 http2_optgroup.add_option('--debug-nghttp2',
     action='store_true',
     dest='debug_nghttp2',
-    help='Build nghttp2 with DEBUGBUILD')
+    help='build nghttp2 with DEBUGBUILD (default is false)')
 
 parser.add_option('--with-perfctr',
     action='store_true',
@@ -898,6 +903,11 @@ def configure_node(o):
   if options.enable_static:
     o['variables']['node_target_type'] = 'static_library'
 
+  if options.debug_http2:
+    o['variables']['debug_http2'] = 1
+  else:
+    o['variables']['debug_http2'] = 'false'
+
   if options.debug_nghttp2:
     o['variables']['debug_nghttp2'] = 1
   else:

deps/nghttp2/nghttp2.gyp

@@ -24,12 +24,14 @@
         'lib/nghttp2_buf.h',
         'lib/nghttp2_callbacks.c',
         'lib/nghttp2_callbacks.h',
+        'lib/nghttp2_debug.c',
+        'lib/nghttp2_debug.h',
         'lib/nghttp2_frame.c',
         'lib/nghttp2_frame.h',
         'lib/nghttp2_hd.c',
         'lib/nghttp2_hd.h',
-        'lib/nghttp2_hd_huffman_data.c',
         'lib/nghttp2_hd_huffman.c',
+        'lib/nghttp2_hd_huffman_data.c',
         'lib/nghttp2_hd_huffman.h',
         'lib/nghttp2_helper.c',
         'lib/nghttp2_helper.h',