httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1701655 [1/4] - in /httpd/httpd/branches/2.4.17-protocols-http2: ./ build/ docs/conf/ docs/conf/extra/ docs/manual/mod/ include/ modules/ modules/http/ modules/http2/ modules/http2/m4/ modules/http2/mod-h2.xcodeproj/ modules/http2/mod_h2/ ...
Date Mon, 07 Sep 2015 17:37:21 GMT
Author: icing
Date: Mon Sep  7 17:37:19 2015
New Revision: 1701655

URL: http://svn.apache.org/r1701655
Log:
merge of protocols + http2 relevant changes

Added:
    httpd/httpd/branches/2.4.17-protocols-http2/docs/conf/extra/httpd-h2.conf.in   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/docs/conf/extra/httpd-h2.conf.in
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.html   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/docs/manual/mod/mod_h2.html
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.html.en   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/docs/manual/mod/mod_h2.html.en
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/docs/manual/mod/mod_h2.xml
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml.meta   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/docs/manual/mod/mod_h2.xml.meta
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/   (props changed)
      - copied from r1688474, httpd/httpd/trunk/modules/http2/
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/Makefile.in   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/Makefile.in
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/NWGNUmakefile
      - copied unchanged from r1697051, httpd/httpd/trunk/modules/http2/NWGNUmakefile
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README.h2   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/README.h2
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/config.m4   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/config.m4
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_alt_svc.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_alt_svc.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_alt_svc.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_alt_svc.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_config.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_config.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_config.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_config.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_conn.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_conn.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_conn.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_conn.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_conn_io.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_conn_io.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_conn_io.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_conn_io.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_ctx.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_ctx.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_ctx.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_ctx.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_from_h1.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_from_h1.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_from_h1.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_from_h1.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_h2.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_h2.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_h2.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_h2.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_io.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_io.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_io.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_io.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_io_set.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_io_set.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_io_set.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_io_set.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_mplx.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_mplx.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_mplx.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_mplx.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_private.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_private.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_request.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_request.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_request.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_request.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_response.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_response.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_response.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_response.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_session.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_session.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_session.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_session.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_stream.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_stream.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_stream.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_stream.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_stream_set.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_stream_set.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_stream_set.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_stream_set.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_switch.c
      - copied, changed from r1692486, httpd/httpd/trunk/modules/http2/h2_switch.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_switch.h
      - copied unchanged from r1692486, httpd/httpd/trunk/modules/http2/h2_switch.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_task.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_task.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task_input.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_task_input.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task_input.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_task_input.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task_output.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_task_output.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task_output.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_task_output.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task_queue.c   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_task_queue.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_task_queue.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_task_queue.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_to_h1.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_to_h1.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_to_h1.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_to_h1.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_util.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_util.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_util.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_util.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_version.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_version.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_worker.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_worker.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_worker.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_worker.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_workers.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/h2_workers.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/h2_workers.h   (props changed)
      - copied unchanged from r1690248, httpd/httpd/trunk/modules/http2/h2_workers.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/mod_h2.c   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/mod_h2.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/mod_h2.dsp
      - copied unchanged from r1698023, httpd/httpd/trunk/modules/http2/mod_h2.dsp
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/mod_h2.h   (contents, props changed)
      - copied, changed from r1690248, httpd/httpd/trunk/modules/http2/mod_h2.h
Removed:
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/AUTHORS
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/COPYING
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/ChangeLog
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/DISCUSS
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/INSTALL
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/LICENSE
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/Makefile.am
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/NEWS
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README.md
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/configure.ac
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/m4/
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/mod-h2.xcodeproj/
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/mod_h2/
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/sandbox/
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/setup/
Modified:
    httpd/httpd/branches/2.4.17-protocols-http2/   (props changed)
    httpd/httpd/branches/2.4.17-protocols-http2/Apache-apr2.dsw
    httpd/httpd/branches/2.4.17-protocols-http2/Apache.dsw
    httpd/httpd/branches/2.4.17-protocols-http2/BuildBin.dsp
    httpd/httpd/branches/2.4.17-protocols-http2/CHANGES
    httpd/httpd/branches/2.4.17-protocols-http2/Makefile.win
    httpd/httpd/branches/2.4.17-protocols-http2/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.4.17-protocols-http2/build/installwinconf.awk
    httpd/httpd/branches/2.4.17-protocols-http2/docs/conf/httpd.conf.in
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/allmodules.xml
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/core.xml
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_proxy.xml
    httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/quickreference.html.en
    httpd/httpd/branches/2.4.17-protocols-http2/include/ap_mmn.h
    httpd/httpd/branches/2.4.17-protocols-http2/include/http_core.h
    httpd/httpd/branches/2.4.17-protocols-http2/include/http_protocol.h
    httpd/httpd/branches/2.4.17-protocols-http2/include/http_request.h
    httpd/httpd/branches/2.4.17-protocols-http2/include/httpd.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/NWGNUmakefile
    httpd/httpd/branches/2.4.17-protocols-http2/modules/README
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_protocol.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_request.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/.gitignore   (props changed)
    httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_engine_init.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_engine_io.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_engine_kernel.c
    httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_private.h
    httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_util.c
    httpd/httpd/branches/2.4.17-protocols-http2/os/win32/BaseAddr.ref
    httpd/httpd/branches/2.4.17-protocols-http2/server/core.c
    httpd/httpd/branches/2.4.17-protocols-http2/server/protocol.c
    httpd/httpd/branches/2.4.17-protocols-http2/server/util.c

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep  7 17:37:19 2015
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,1214003,1214005,1214015,12
 15514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827,1304087,1304874-1304875,1305167
 ,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1311468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,1343087,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368121,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,1369995,1369999,1370
 001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374247,1374874,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1378178,1383490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,1387110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447,1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-1389569,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,1395792,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066,1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,1403476,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1407381,1407459-1407460,1407528,1
 407853,1407965,1408093,1408402,1408958,1408961,1409170,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,1415023,1415075,1416121,1416150,1416278,1417197,1417529,1418524,1418556,1418648,1418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421323,1421851,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,1423353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,1439106,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,1448171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,1453574,1453604,1453875-1453876,1453963,145398
 1,1454386,1454414-1454415,1454888,1457437,1457450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285,1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463052,1463056,1463455,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-1476645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411,1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,1481891,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1488158,1488164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155,1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492663,1492710,1492782,1493330,1493921,1493925,1494536,1495501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,1499679,1500323,1500345,150
 0362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506714,1509872,1509983,1510084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,1520908,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,1524770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,1532746,1532816,1533065,1533224,1534321,1534754,1534890,1534892,1536310,1537535,1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542615,1543020,1543147,1543149,1543174,1544381,1544774,1544784,1544812,1544820,1545286,
 1545292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801,1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551685,1551714,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-1554995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569,1556206,1556428,1556911-1556912,1556914,1556937,1557317,1557617,1558483,1559351,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,1564437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1574151,1575400,1576233,1576741,1578760,1578762,1580568,1583005,1583007-1583008,1583027,1583175,15831
 91,1584098,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585435,1585609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1587639,1587654,1588054,1588065,1588213,1588427,1588519,1588527,1588704,1588851,1588853,1589413,1590437,1590509,1591143,1591320,1591322,1591328,1591390,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,1592615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1597352,1597639,1597642,1598107,1598946,1601076,1601184-1601185,1601274,1601291,1601630,1601919,1601995,1602338,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1611165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1618401,1618541,1619297,1619383,1619444,1619835,1620324,1620461,1620932,16
 21367,1621372,1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626978,1628104,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629372,1629440-1629441,1629485,1629507-1629508,1629519,1629577,1629652,1631885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736,1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,1639614,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642499,1642847,1642868,1643034,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649632,1649966,1650047,1650061,1650309-1650310,1650320,1651088,1652829,1652929,1652931,1652955,1652982,1652985,1652989,1653997,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448,1661464,1661486,1662245-1662246,1663017,1663647,1664071,1664133,1664205,1664299,1665215,1665218,1665625,1665643,1665721,1666297
 ,1666361,1666363,1666468,1666618,1666998,1667385-1667386,1668532,1668535,1668553,1669130,1669289,1669292,1671364,1671396-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,1672989,1673113,1673155,1673455,1673769,1674056,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676842,1677096,1677462,1679032,1679181-1679182,1679192,1679428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424,1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,1682979,1682988,1683123,1684057,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1687980,1688274,1688536,1688538,1688660,1689325,1689694,1689698,1693919,1693963,1694903,1694936,1695170
+/httpd/httpd/trunk:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,1214003,1214005,1214015,12
 15514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827,1304087,1304874-1304875,1305167
 ,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1311468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,1343087,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368121,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,1369995,1369999,1370
 001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374247,1374874,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1378178,1383490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,1387110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447,1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-1389569,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,1395792,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066,1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,1403476,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1407381,1407459-1407460,1407528,1
 407853,1407965,1408093,1408402,1408958,1408961,1409170,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,1415023,1415075,1416121,1416150,1416278,1417197,1417529,1418524,1418556,1418648,1418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421323,1421851,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,1423353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,1439106,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,1448171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,1453574,1453604,1453875-1453876,1453963,145398
 1,1454386,1454414-1454415,1454888,1457437,1457450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285,1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463052,1463056,1463455,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-1476645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411,1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,1481891,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1488158,1488164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155,1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492663,1492710,1492782,1493330,1493921,1493925,1494536,1495501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,1499679,1500323,1500345,150
 0362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506714,1509872,1509983,1510084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,1520908,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,1524770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,1532746,1532816,1533065,1533224,1534321,1534754,1534890,1534892,1536310,1537535,1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542615,1543020,1543147,1543149,1543174,1544381,1544774,1544784,1544812,1544820,1545286,
 1545292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801,1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551685,1551714,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-1554995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569,1556206,1556428,1556911-1556912,1556914,1556937,1557317,1557617,1558483,1559351,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,1564437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1574151,1575400,1576233,1576741,1578760,1578762,1580568,1583005,1583007-1583008,1583027,1583175,15831
 91,1584098,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585435,1585609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1587639,1587654,1588054,1588065,1588213,1588427,1588519,1588527,1588704,1588851,1588853,1589413,1590437,1590509,1591143,1591320,1591322,1591328,1591390,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,1592615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1597352,1597639,1597642,1598107,1598946,1601076,1601184-1601185,1601274,1601291,1601630,1601919,1601995,1602338,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1618401,1618541,1619297,1619383,1619444,1619835,1620324,1620461,16
 20932,1621367,1621372,1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626978,1628104,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629372,1629440-1629441,1629485,1629507-1629508,1629519,1629577,1629652,1631885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736,1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,1639614,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642499,1642847,1642868,1643034,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649632,1649966,1650047,1650061,1650309-1650310,1650320,1651088,1652829,1652929,1652931,1652955,1652982,1652985,1652989,1653997,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448,1661464,1661486,1662245-1662246,1663017,1663647,1664071,1664133,1664205,1664299,1665215,1665218,1665625,1665643,1665721
 ,1666297,1666361,1666363,1666468,1666618,1666998,1667385-1667386,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,1672989,1673113,1673155,1673455,1673769,1674056,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677462,1679032,1679181-1679182,1679192,1679428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424,1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,1682979,1682988,1683123,1684057,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1687980,1688274,1688474-1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696264,1696266,1696279,1696428,1696
 442,1696565,1696592,1696607,1696755,1696881,1697051,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1700271,1700275,1700514,1700777,1700917,1700925,1700968,1701005,1701145,1701178,1701204

Modified: httpd/httpd/branches/2.4.17-protocols-http2/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/Apache-apr2.dsw?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/Apache-apr2.dsw (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/Apache-apr2.dsw Mon Sep  7 17:37:19 2015
@@ -1723,6 +1723,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_h2"=.\modules\http2\mod_h2.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_headers"=.\modules\metadata\mod_headers.dsp - Package Owner=<4>
 
 Package=<5>

Modified: httpd/httpd/branches/2.4.17-protocols-http2/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/Apache.dsw?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/Apache.dsw (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/Apache.dsw Mon Sep  7 17:37:19 2015
@@ -2041,6 +2041,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_h2"=.\modules\http2\mod_h2.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_headers"=.\modules\metadata\mod_headers.dsp - Package Owner=<4>
 
 Package=<5>

Modified: httpd/httpd/branches/2.4.17-protocols-http2/BuildBin.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/BuildBin.dsp?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/BuildBin.dsp (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/BuildBin.dsp Mon Sep  7 17:37:19 2015
@@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"
@@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"

Modified: httpd/httpd/branches/2.4.17-protocols-http2/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/CHANGES?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/CHANGES [utf-8] Mon Sep  7 17:37:19 2015
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache 2.4.17
+  *) mod_h2: added donated http/2 implementation to build system. Similar
+     configuration options to mod_ssl. [Stefan Eissing]
 
   *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting
      ';' as an alternate separator.  PR47241. 

Modified: httpd/httpd/branches/2.4.17-protocols-http2/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/Makefile.win?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/Makefile.win (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/Makefile.win Mon Sep  7 17:37:19 2015
@@ -215,6 +215,30 @@ _trylua:
 
 !ENDIF
 
+!IF EXIST("srclib\nghttp2")
+
+_trynghttp2:
+!IF $(USEMAK) == 1
+	cd modules\http2
+	$(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	cd ..\..
+!ELSEIF $(USESLN) == 1
+	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2
+!ELSE
+	@msdev $(TLP).dsw /USEENV /MAKE \
+		"mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ELSE
+#     NOT EXIST("srclib\lua")
+
+_trynghttp2:
+	@echo -----
+	@echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2.
+	@echo Version 1.0 includes an lib\makefile.msvc that will satisfy this
+	@echo requirement.
+
+!ENDIF
 
 _trydb:
 !IF $(USEMAK) == 1
@@ -754,6 +778,14 @@ _copybin:
 	copy modules\generators\$(LONG)\mod_info.$(src_so) 	"$(inst_so)" <.y
 	copy modules\generators\$(LONG)\mod_status.$(src_so) 	"$(inst_so)" <.y
 	copy modules\http\$(LONG)\mod_mime.$(src_so) 		"$(inst_so)" <.y
+!IF EXIST("srclib\nghttp2")
+	copy modules\http2\$(LONG)\mod_h2.$(src_so) 		"$(inst_so)" <.y
+!IF "$(SHORT)" == "D"
+	copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll)		 	"$(inst_dll)" <.y
+!ELSE
+	copy srclib\nghttp2\lib\MSVC_obj\nghttp2.$(src_dll)		 	"$(inst_dll)" <.y
+!ENDIF
+!ENDIF
 	copy modules\ldap\$(LONG)\mod_ldap.$(src_so)		"$(inst_so)" <.y
 	copy modules\loggers\$(LONG)\mod_log_config.$(src_so) 	"$(inst_so)" <.y
 	copy modules\loggers\$(LONG)\mod_log_debug.$(src_so) 	"$(inst_so)" <.y

Modified: httpd/httpd/branches/2.4.17-protocols-http2/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/build/NWGNUenvironment.inc?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/build/NWGNUenvironment.inc Mon Sep  7 17:37:19 2015
@@ -49,6 +49,12 @@ ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)
 $(error LDAPSDK does not point to a valid Novell CLDAP SDK) 
 endif
 
+ifdef WITH_HTTP2
+ifneq "$(wildcard $(NGH2SRC)/lib/nghttp2_hd.h)" "$(NGH2SRC)/lib/nghttp2_hd.h"
+$(error NGH2SRC does not point to a valid NGHTTP2 source tree)
+endif
+endif
+
 ifndef PCRESRC
 PCRESRC = $(AP_WORK)/srclib/pcre
 endif

Modified: httpd/httpd/branches/2.4.17-protocols-http2/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/build/installwinconf.awk?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/build/installwinconf.awk (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/build/installwinconf.awk Mon Sep  7 17:37:19 2015
@@ -59,6 +59,7 @@ BEGIN {
     filelist["httpd-dav.conf"] = "httpd-dav.conf.in";
     filelist["httpd-default.conf"] = "httpd-default.conf.in";
     filelist["httpd-info.conf"] = "httpd-info.conf.in";
+    filelist["httpd-h2.conf"] = "httpd-h2.conf.in";
     filelist["httpd-languages.conf"] = "httpd-languages.conf.in";
     filelist["httpd-manual.conf"] = "httpd-manual.conf.in";
     filelist["httpd-mpm.conf"] = "httpd-mpm.conf.in";
@@ -136,6 +137,7 @@ BEGIN {
           print "#LoadModule ext_filter_module modules/mod_ext_filter.so" > dstfl;
           print "#LoadModule file_cache_module modules/mod_file_cache.so" > dstfl;
           print "#LoadModule filter_module modules/mod_filter.so" > dstfl;
+          print "#LoadModule h2_module modules/mod_h2.so" > dstfl;
           print "#LoadModule headers_module modules/mod_headers.so" > dstfl;
           print "#LoadModule heartbeat_module modules/mod_heartbeat.so" > dstfl;
           print "#LoadModule heartmonitor_module modules/mod_heartmonitor.so" > dstfl;

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/docs/conf/extra/httpd-h2.conf.in
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/branches/2.4.17-protocols-http2/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/docs/conf/httpd.conf.in?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/docs/conf/httpd.conf.in Mon Sep  7 17:37:19 2015
@@ -418,3 +418,6 @@ SSLRandomSeed connect builtin
 #RequestHeader unset DNT env=bad_DNT
 #</IfModule>
 
+# h2/h2c (HTTP/2) connections
+#Include @rel_sysconfdir@/extra/httpd-h2.conf
+

Modified: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/allmodules.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/allmodules.xml?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/allmodules.xml (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/allmodules.xml Mon Sep  7 17:37:19 2015
@@ -51,6 +51,7 @@
   <modulefile>mod_ext_filter.xml</modulefile>
   <modulefile>mod_file_cache.xml</modulefile>
   <modulefile>mod_filter.xml</modulefile>
+  <modulefile>mod_h2.xml</modulefile>
   <modulefile>mod_headers.xml</modulefile>
   <modulefile>mod_heartbeat.xml</modulefile>
   <modulefile>mod_heartmonitor.xml</modulefile>

Modified: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/core.xml?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/core.xml Mon Sep  7 17:37:19 2015
@@ -3590,6 +3590,74 @@ On Windows, from Apache 2.3.3 and later.
 
 
 <directivesynopsis>
+    <name>Protocols</name>
+    <description>Protocols available for a server/virtual host</description>
+    <syntax>Protocols <var>protocol</var> ...</syntax>
+    <default>Protocols http/1.1</default>
+    <contextlist><context>server config</context><context>virtual host</context></contextlist>
+    <compatibility>Only available from Apache 2.4.17 and later.</compatibility>
+    
+    <usage>
+        <p>This directive specifies the list of protocols supported for a
+            server/virtual host. The list determines the allowed protocols
+            a client may negotiate for this server/host.</p>
+        
+        <p>You need to set protocols if you want to extend the available
+            protocols for a server/host. By default, only the http/1.1 protocol
+            (which includes the compatibility with 1.0 and 0.9 clients) is
+            allowed.</p>
+        
+        <p>For example, if you want to support HTTP/2 for a server with TLS, 
+            specify:</p>
+        
+        <highlight language="config">
+            Protocols h2 http/1.1
+        </highlight>
+
+        <p>Valid protocols are <code>http/1.1</code> for http and https connections,
+            <code>h2</code> on https connections and <code>h2c</code> for http
+            connections. Modules may enable more protocols.</p>
+        
+        <p>It is safe to specify protocols that are unavailable/disabled. Such
+        protocol names will simply be ignored.</p>
+        
+        <p>Protocols specified in base servers are inherited for virtual hosts 
+            only if the virtual host has no own Protocols directive. Or, the other
+            way around, Protocols directives in virtual hosts replace any
+            such directive in the base server.
+        </p>
+
+    </usage>
+    <seealso><directive module="core">ProtocolsHonorOrder</directive></seealso>
+</directivesynopsis>
+
+
+<directivesynopsis>
+    <name>ProtocolsHonorOrder</name>
+    <description>Protocols available for a server/virtual host</description>
+    <syntax>ProtocolsHonorOrder On|Off</syntax>
+    <default>ProtocolsHonorOrder On</default>
+    <contextlist><context>server config</context><context>virtual host</context></contextlist>
+    <compatibility>Only available from Apache 2.4.17 and later.</compatibility>
+    
+    <usage>
+        <p>This directive specifies if the server should honor the order in which
+        the <directive>Protocols</directive> directive lists protocols.</p>
+        
+        <p>If configured Off, the client supplied list order of protocols has 
+            precedence over the order in the server configuration.</p>
+        
+        <p>With <directive>ProtocolsHonorOrder</directive> set to <code>on</code> 
+            (default), the client ordering does not matter and only the ordering 
+            in the server settings influences the outcome of the protocol 
+            negotiation.</p>
+        
+    </usage>
+    <seealso><directive module="core">Protocols</directive></seealso>
+</directivesynopsis>
+
+
+<directivesynopsis>
 <name>RLimitCPU</name>
 <description>Limits the CPU consumption of processes launched
 by Apache httpd children</description>

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.html.en
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml (from r1690248, httpd/httpd/trunk/docs/manual/mod/mod_h2.xml)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml?p2=httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml&p1=httpd/httpd/trunk/docs/manual/mod/mod_h2.xml&r1=1690248&r2=1701655&rev=1701655&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_h2.xml (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml Mon Sep  7 17:37:19 2015
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $LastChangedRevision: 1682937 $ -->
+<!-- $LastChangedRevision$ -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,44 +38,10 @@
     </summary>
     
     <directivesynopsis>
-        <name>H2Engine</name>
-        <description>H2 Engine Operation Switch</description>
-        <syntax>H2Engine on|off</syntax>
-        <default>H2Engine off</default>
-        <contextlist>
-            <context>server config</context>
-            <context>virtual host</context>
-        </contextlist>
-        
-        <usage>
-            <p>
-                This directive toggles the usage of the HTTP/2 Protocol Engine. This
-                should be used inside a 
-                <directive module="core" type="section">VirtualHost</directive> 
-                section to enable HTTP/2 for that virtual host. By default the 
-                HTTP/2 Protocol Engine is disabled for both the main server and all 
-                configured virtual hosts.
-            </p>
-            <example><title>Example</title>
-                <highlight language="config">
-&lt;VirtualHost _default_:443&gt;
-    H2Engine on
-    #...
-&lt;/VirtualHost&gt;
-                </highlight>
-            </example>
-            <p>
-                The HTTP/2 engine is usable in TLS and plain scenarios, supporting
-                the 'h2' and 'h2c' variants of the protocol. 
-            </p>
-        </usage>
-    </directivesynopsis>
-    
-    <directivesynopsis>
         <name>H2Direct</name>
         <description>H2 Direct Protocol Switch</description>
         <syntax>H2Direct on|off</syntax>
-        <default>H2Direct on</default>
+        <default>H2Direct on (for non TLS)</default>
         <contextlist>
             <context>server config</context>
             <context>virtual host</context>
@@ -179,29 +145,6 @@
     </directivesynopsis>
 
     <directivesynopsis>
-        <name>H2MaxHeaderListSize</name>
-        <description>Maximum size of acceptable stream headers.</description>
-        <syntax>H2MaxHeaderListSize <em>bytes</em></syntax>
-        <default>H2MaxHeaderListSize 16384</default>
-        <contextlist>
-            <context>server config</context>
-            <context>virtual host</context>
-        </contextlist>
-        <usage>
-            <p>
-                This directive sets the maximum amount of stream header bytes that
-                the server is willing to accept. It is announced to the client during
-                the initial HTTP/2 handshake.
-            </p>
-            <example><title>Example</title>
-                <highlight language="config">
-                    H2MaxHeaderListSize 10000
-                </highlight>
-            </example>
-        </usage>
-    </directivesynopsis>
-
-    <directivesynopsis>
         <name>H2MinWorkers</name>
         <description>Minimal number of worker threads to use per child process.</description>
         <syntax>H2MinWorkers <em>n</em></syntax>
@@ -265,87 +208,6 @@
                 </highlight>
             </example>
         </usage>
-    </directivesynopsis>
-
-    <directivesynopsis>
-        <name>H2BufferOutput</name>
-        <description>Output Buffering Switch</description>
-        <syntax>H2BufferOutput on|off</syntax>
-        <contextlist>
-            <context>server config</context>
-            <context>virtual host</context>
-        </contextlist>
-        <usage>
-            <p>
-                This directive toggles if buffering of HTTP/2 output shall be used
-                or if data is written immediately when it arrives. Unless specified
-                otherwise, this directive is <code>on</code> for TLS connections and
-                <code>off</code> for plain connections.
-            </p>
-            <example><title>Example</title>
-                <highlight language="config">
-                    H2BufferOutput on
-                </highlight>
-            </example>
-        </usage>
-    </directivesynopsis>
-
-    <directivesynopsis>
-        <name>H2BufferSize</name>
-        <description>Buffer size for outgoing data per HTTP/2 connection.</description>
-        <syntax>H2BufferSize <em>bytes</em></syntax>
-        <default>H2BufferSize 65536</default>
-        <contextlist>
-            <context>server config</context>
-            <context>virtual host</context>
-        </contextlist>
-        <usage>
-            <p>
-                This directive sets the size of the buffer used to hold outgoing
-                HTTP/2 raw data, should <code>H2BufferOutput</code> be switched on.
-                This data is allocated per HTTP/2 connection, not stream and is
-                counted against the raw protocol data.
-            </p>
-            <example><title>Example</title>
-                <highlight language="config">
-                    H2BufferSize 128000
-                </highlight>
-            </example>
-        </usage>
-    </directivesynopsis>
-
-    <directivesynopsis>
-        <name>H2BufferWriteMax</name>
-        <description>Maximum size of write on a HTTP/2 connection.</description>
-        <syntax>H2BufferWriteMax <em>bytes</em></syntax>
-        <default>H2BufferWriteMax 16384</default>
-        <contextlist>
-            <context>server config</context>
-            <context>virtual host</context>
-        </contextlist>
-        <usage>
-            <p>
-                This directive sets maximum amount of data sent out in a single 
-                write on a http/2 connection. It only takes effect when 
-                <code>H2BufferOutput</code> is switched on.
-            </p><p>
-                This directive affects performance of underlying TLS transports. TLS
-                transforms each write into an encrypted record. Clients need
-                to receive all of the record in order to decrypt it. Larger sizes
-                result in better server performance, shorter sizes can affect web
-                page paint timings.
-            </p><p>
-                <code>BufferSize</code> should be a multiple of <code>H2BufferWriteMax</code>.
-                <code>H2BufferWriteMax</code>, if larger than 16k, should be a multiple of 16k,
-                since this is the TLS max record size. Be aware that there are TLS 
-                extensions to limit the record size to powers of 2 less than 16k.
-            </p>
-            <example><title>Example</title>
-                <highlight language="config">
-                    H2BufferWriteMax 8000
-                </highlight>
-            </example>
-        </usage>
     </directivesynopsis>
 
     <directivesynopsis>

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml
------------------------------------------------------------------------------
    svn:keywords = LastChangedRevision

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_h2.xml.meta
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_proxy.xml?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/mod_proxy.xml Mon Sep  7 17:37:19 2015
@@ -1202,9 +1202,9 @@ ProxyPass "/mirror/foo" "http://backend.
         <td>Balancer sticky session name. The value is usually set to something
         like <code>JSESSIONID</code> or <code>PHPSESSIONID</code>,
         and it depends on the backend application server that support sessions.
-        If the backend application server uses different names for cookies
-        and url encoded id (like servlet containers), use | to separate them.
-        The first part is for the cookie; the second for the path.<br />
+        If the backend application server uses different name for cookies
+        and url encoded id (like servlet containers) use | to separate them.
+        The first part is for the cookie the second for the path.<br />
         Available in Apache HTTP Server 2.4.4 and later.
     </td></tr>
     <tr><td>stickysessionsep</td>

Modified: httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/quickreference.html.en?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/docs/manual/mod/quickreference.html.en Mon Sep  7 17:37:19 2015
@@ -467,7 +467,21 @@ media type in the HTTP Content-Type head
 will exit.</td></tr>
 <tr class="odd"><td><a href="mod_unixd.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|setifempty|unset|note
+<tr><td><a href="mod_h2.html#h2bufferoutput" id="H" name="H">H2BufferOutput on|off</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Output Buffering Switch</td></tr>
+<tr class="odd"><td><a href="mod_h2.html#h2buffersize">H2BufferSize <em>bytes</em></a></td><td> 65536 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Buffer size for outgoing data per HTTP/2 connection.</td></tr>
+<tr><td><a href="mod_h2.html#h2bufferwritemax">H2BufferWriteMax <em>bytes</em></a></td><td> 16384 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum size of write on a HTTP/2 connection.</td></tr>
+<tr class="odd"><td><a href="mod_h2.html#h2direct">H2Direct on|off</a></td><td> on </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">H2 Direct Protocol Switch</td></tr>
+<tr><td><a href="mod_h2.html#h2engine">H2Engine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">H2 Engine Operation Switch</td></tr>
+<tr class="odd"><td><a href="mod_h2.html#h2maxheaderlistsize">H2MaxHeaderListSize <em>bytes</em></a></td><td> 16384 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of acceptable stream headers.</td></tr>
+<tr><td><a href="mod_h2.html#h2maxsessionstreams">H2MaxSessionStreams <em>n</em></a></td><td> 100 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of active streams per HTTP/2 session.</td></tr>
+<tr class="odd"><td><a href="mod_h2.html#h2maxworkeridleseconds">H2MaxWorkerIdleSeconds <em>n</em></a></td><td> 600 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of seconds h2 workers remain idle until shut down.</td></tr>
+<tr><td><a href="mod_h2.html#h2maxworkers">H2MaxWorkers <em>n</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of worker threads to use per child process.</td></tr>
+<tr class="odd"><td><a href="mod_h2.html#h2minworkers">H2MinWorkers <em>n</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimal number of worker threads to use per child process.</td></tr>
+<tr><td><a href="mod_h2.html#h2serializeheaders">H2SerializeHeaders on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Serialize Request/Resoonse Processing Switch</td></tr>
+<tr class="odd"><td><a href="mod_h2.html#h2sessionextrafiles">H2SessionExtraFiles <em>n</em></a></td><td> 5 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of Extra File Handles</td></tr>
+<tr><td><a href="mod_h2.html#h2streammaxmemsize">H2StreamMaxMemSize <em>bytes</em></a></td><td> 65536 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum amount of output data buffered per stream.</td></tr>
+<tr class="odd"><td><a href="mod_h2.html#h2windowsize">H2WindowSize <em>bytes</em></a></td><td> 65536 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Size of Stream Window for upstream data.</td></tr>
+<tr><td><a href="mod_headers.html#header">Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|setifempty|unset|note
 <var>header</var> [[expr=]<var>value</var> [<var>replacement</var>]
 [early|env=[!]<var>varname</var>|expr=<var>expression</var>]]
 </a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP response headers</td></tr>

Modified: httpd/httpd/branches/2.4.17-protocols-http2/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/include/ap_mmn.h?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/include/ap_mmn.h Mon Sep  7 17:37:19 2015
@@ -445,6 +445,7 @@
  * 20120211.46 (2.4.13-dev) Add ap_map_http_request_error()
  * 20120211.47 (2.4.13-dev) Add ap_some_authn_required, ap_force_authn hook.
  *                          Deprecate broken ap_some_auth_required.
+ * 20140627.4 (2.5.0-dev)  Added ap_parse_token_list_strict() to httpd.h.
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */

Modified: httpd/httpd/branches/2.4.17-protocols-http2/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/include/http_core.h?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/include/http_core.h (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/include/http_core.h Mon Sep  7 17:37:19 2015
@@ -681,6 +681,10 @@ typedef struct {
 #define AP_MERGE_TRAILERS_DISABLE  2
     int merge_trailers;
 
+
+
+    apr_array_header_t *protocols;
+    int protocols_honor_order;
 } core_server_config;
 
 /* for AddOutputFiltersByType in core.c */

Modified: httpd/httpd/branches/2.4.17-protocols-http2/include/http_protocol.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/include/http_protocol.h?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/include/http_protocol.h (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/include/http_protocol.h Mon Sep  7 17:37:19 2015
@@ -700,6 +700,139 @@ AP_DECLARE_HOOK(const char *,http_scheme
  */
 AP_DECLARE_HOOK(apr_port_t,default_port,(const request_rec *r))
 
+
+#define AP_PROTOCOL_HTTP1		"http/1.1"
+
+/**
+ * Determine the list of protocols available for a connection/request. This may
+ * be collected with or without any request sent, in which case the request is 
+ * NULL. Or it may be triggered by the request received, e.g. through the 
+ * "Upgrade" header.
+ *
+ * This hook will be run whenever protocols are being negotiated (ALPN as
+ * one example). It may also be invoked at other times, e.g. when the server
+ * wants to advertise protocols it is capable of switching to.
+ * 
+ * The identifiers for protocols are taken from the TLS extension type ALPN:
+ * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xml
+ *
+ * If no protocols are added to the proposals, the server not perform any
+ * switch. If the protocol selected from the proposals is the protocol
+ * already in place, also no protocol switch will be invoked.
+ *
+ * The client may already have announced the protocols it is willing to
+ * accept. These will then be listed as offers. This parameter may also
+ * be NULL, indicating that offers from the client are not known and
+ * the hooks should propose all protocols that are valid for the
+ * current connection/request.
+ *
+ * All hooks are run, unless one returns an error. Proposals may contain
+ * duplicates. The order in which proposals are added is usually ignored.
+ * 
+ * @param c The current connection
+ * @param r The current request or NULL
+ * @param s The server/virtual host selected
+ * @param offers A list of protocol identifiers offered by the client or
+ *               NULL to indicated that the hooks are free to propose 
+ * @param proposals The list of protocol identifiers proposed by the hooks
+ * @return OK or DECLINED
+ */
+AP_DECLARE_HOOK(int,protocol_propose,(conn_rec *c, request_rec *r,
+                                      server_rec *s,
+                                      const apr_array_header_t *offers,
+                                      apr_array_header_t *proposals))
+
+/**
+ * Perform a protocol switch on the connection. The exact requirements for
+ * that depend on the protocol in place and the one switched to. The first 
+ * protocol module to handle the switch is the last module run.
+ * 
+ * For a connection level switch (r == NULL), the handler must on return
+ * leave the conn_rec in a state suitable for processing the switched
+ * protocol, e.g. correct filters in place.
+ *
+ * For a request triggered switch (r != NULL), the protocol switch is done
+ * before the response is sent out. When switching from "http/1.1" via Upgrade
+ * header, the 101 intermediate response will have been sent. The
+ * hook needs then to process the connection until it can be closed. Which
+ * the server will enforce on hook return.
+ * Any error the hook might encounter must already be sent by the hook itself
+ * to the client in whatever form the new protocol requires.
+ *
+ * @param c The current connection
+ * @param r The current request or NULL
+ * @param s The server/virtual host selected
+ * @param choices A list of protocol identifiers, normally the clients whishes
+ * @param proposals the list of protocol identifiers proposed by the hooks
+ * @return OK or DECLINED
+ */
+AP_DECLARE_HOOK(int,protocol_switch,(conn_rec *c, request_rec *r,
+                                     server_rec *s,
+                                     const char *protocol))
+
+/**
+ * Return the protocol used on the connection. Modules implementing
+ * protocol switching must register here and return the correct protocol
+ * identifier for connections they switched.
+ *
+ * To find out the protocol for the current connection, better call
+ * @see ap_get_protocol which internally uses this hook.
+ *
+ * @param c The current connection
+ * @return The identifier of the protocol in place or NULL
+ */
+AP_DECLARE_HOOK(const char *,protocol_get,(const conn_rec *c))
+    
+/**
+ * Select a protocol for the given connection and optional request. Will return
+ * the protocol identifier selected which may be the protocol already in place
+ * on the connection. The selected protocol will be NULL if non of the given
+ * choices could be agreed upon (e.g. no proposal as made).
+ *
+ * A special case is where the choices itself is NULL (instead of empty). In
+ * this case there are no restrictions imposed on protocol selection.
+ *
+ * @param c The current connection
+ * @param r The current request or NULL
+ * @param s The server/virtual host selected
+ * @param choices A list of protocol identifiers, normally the clients whishes
+ * @return The selected protocol or NULL if no protocol could be agreed upon
+ */
+AP_DECLARE(const char *) ap_select_protocol(conn_rec *c, request_rec *r, 
+                                            server_rec *s,
+                                            const apr_array_header_t *choices);
+
+/**
+ * Perform the actual protocol switch. The protocol given must have been
+ * selected before on the very same connection and request pair.
+ *
+ * @param c The current connection
+ * @param r The current request or NULL
+ * @param s The server/virtual host selected
+ * @param protocol the protocol to switch to
+ * @return APR_SUCCESS, if caller may continue processing as usual
+ *         APR_EOF,     if caller needs to stop processing the connection
+ *         APR_EINVAL,  if the protocol is already in place
+ *         APR_NOTIMPL, if no module performed the switch
+ *         Other errors where appropriate
+ */
+AP_DECLARE(apr_status_t) ap_switch_protocol(conn_rec *c, request_rec *r, 
+                                            server_rec *s,
+                                            const char *protocol);
+
+/**
+ * Call the protocol_get hook to determine the protocol currently in use
+ * for the given connection.
+ *
+ * Unless another protocol has been switch to, will default to
+ * @see AP_PROTOCOL_HTTP1 and modules implementing a  new protocol must
+ * report a switched connection via the protocol_get hook.
+ *
+ * @param c The connection to determine the protocol for
+ * @return the protocol in use, never NULL
+ */
+AP_DECLARE(const char *) ap_get_protocol(conn_rec *c);
+
 /** @see ap_bucket_type_error */
 typedef struct ap_bucket_error ap_bucket_error;
 

Modified: httpd/httpd/branches/2.4.17-protocols-http2/include/http_request.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/include/http_request.h?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/include/http_request.h (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/include/http_request.h Mon Sep  7 17:37:19 2015
@@ -315,7 +315,7 @@ AP_DECLARE(void) ap_allow_standard_metho
  * the response to the client
  * @param r The current request
  */
-void ap_process_request(request_rec *r);
+AP_DECLARE(void) ap_process_request(request_rec *r);
 
 /* For post-processing after a handler has finished with a request.
  * (Commonly used after it was suspended)

Modified: httpd/httpd/branches/2.4.17-protocols-http2/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/include/httpd.h?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/include/httpd.h (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/include/httpd.h Mon Sep  7 17:37:19 2015
@@ -518,6 +518,7 @@ AP_DECLARE(const char *) ap_get_server_b
 #define HTTP_UNSUPPORTED_MEDIA_TYPE          415
 #define HTTP_RANGE_NOT_SATISFIABLE           416
 #define HTTP_EXPECTATION_FAILED              417
+#define HTTP_MISDIRECTED_REQUEST             421
 #define HTTP_UNPROCESSABLE_ENTITY            422
 #define HTTP_LOCKED                          423
 #define HTTP_FAILED_DEPENDENCY               424
@@ -1549,6 +1550,23 @@ AP_DECLARE(int) ap_find_etag_weak(apr_po
 AP_DECLARE(int) ap_find_etag_strong(apr_pool_t *p, const char *line, const char *tok);
 
 /**
+ * Retrieve an array of tokens in the format "1#token" defined in RFC2616. Only
+ * accepts ',' as a delimiter, does not accept quoted strings, and errors on
+ * any separator.
+ * @param p The pool to allocate from
+ * @param tok The line to read tokens from
+ * @param tokens Pointer to an array of tokens. If not NULL, must be an array
+ *    of char*, otherwise it will be allocated on @a p when a token is found
+ * @param skip_invalid If true, when an invalid separator is encountered, it
+ *    will be ignored.
+ * @return NULL on success, an error string otherwise.
+ * @remark *tokens may be NULL on output if NULL in input and no token is found
+ */
+AP_DECLARE(const char *) ap_parse_token_list_strict(apr_pool_t *p, const char *tok,
+                                                    apr_array_header_t **tokens,
+                                                    int skip_invalid);
+
+/**
  * Retrieve a token, spacing over it and adjusting the pointer to
  * the first non-white byte afterwards.  Note that these tokens
  * are delimited by semis and commas and can also be delimited
@@ -2265,6 +2283,28 @@ AP_DECLARE(char *) ap_get_exec_line(apr_
 
 #define AP_NORESTART APR_OS_START_USEERR + 1
 
+/**
+ * Get the first index of the string in the array or -1 if not found. Start
+ * searching a start. 
+ * @param array The array the check
+ * @param s The string to find
+ * @param start Start index for search. If start is out of bounds (negative or  
+                equal to array length or greater), -1 will be returned.
+ * @return index of string in array or -1
+ */
+AP_DECLARE(int) ap_array_str_index(const apr_array_header_t *array, 
+                                   const char *s,
+                                   int start);
+
+/**
+ * Check if the string is member of the given array by strcmp.
+ * @param array The array the check
+ * @param s The string to find
+ * @return !=0 iff string is member of array (via strcmp)
+ */
+AP_DECLARE(int) ap_array_str_contains(const apr_array_header_t *array, 
+                                      const char *s);
+
 #ifdef __cplusplus
 }
 #endif

Modified: httpd/httpd/branches/2.4.17-protocols-http2/modules/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/modules/NWGNUmakefile?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/modules/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/modules/NWGNUmakefile Mon Sep  7 17:37:19 2015
@@ -5,7 +5,8 @@
 #  variable WITH_SSL=1
 # To build with the mod_lua module set the environment
 #  variable WITH_LUA=1
-
+# To build with the mod_h2 module set the environment
+#  variable WITH_HTTP2=1
 #
 # Check if LDAP is enabled in APR-UTIL
 #
@@ -72,6 +73,13 @@ SUBDIRS += lua
 endif
 endif
 
+# Allow the mod_h2 module to be built if WITH_HTTP2 is defined
+ifeq "$(WITH_HTTP2)" "1"
+ifneq "$(NGH2SRC)" ""
+SUBDIRS += http2
+endif
+endif
+
 # Allow the experimental modules to be built if WITH_EXPERIMENTAL is defined
 ifeq "$(WITH_EXPERIMENTAL)" "1"
 SUBDIRS += experimental

Modified: httpd/httpd/branches/2.4.17-protocols-http2/modules/README
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/modules/README?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/modules/README (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/modules/README Mon Sep  7 17:37:19 2015
@@ -41,6 +41,9 @@ generators/
 http/
   This directory houses modules that basic HTTP protocol implementation.
 
+http2/
+  This directory houses modules that provide HTTP/2 protocol implementation.
+
 loggers/
   This directory houses modules that handle logging functions.
 

Modified: httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_protocol.c?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_protocol.c (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_protocol.c Mon Sep  7 17:37:19 2015
@@ -135,7 +135,7 @@ static const char * const status_lines[R
     NULL, /* 418 */
     NULL, /* 419 */
     NULL, /* 420 */
-    NULL, /* 421 */
+    "421 Misdirected Request",
     "422 Unprocessable Entity",
     "423 Locked",
     "424 Failed Dependency",
@@ -1293,6 +1293,11 @@ static const char *get_canned_error_stri
     case HTTP_NETWORK_AUTHENTICATION_REQUIRED:
         return("<p>The client needs to authenticate to gain\n"
                "network access.</p>\n");
+    case HTTP_MISDIRECTED_REQUEST:
+        return("<p>The client needs a new connection for this\n"
+               "request as the requested host name does not match\n"
+               "the Server Name Indication (SNI) in use for this\n"
+               "connection.</p>\n");
     default:                    /* HTTP_INTERNAL_SERVER_ERROR */
         /*
          * This comparison to expose error-notes could be modified to

Modified: httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_request.c?rev=1701655&r1=1701654&r2=1701655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_request.c (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/modules/http/http_request.c Mon Sep  7 17:37:19 2015
@@ -363,7 +363,7 @@ void ap_process_async_request(request_re
     ap_process_request_after_handler(r);
 }
 
-void ap_process_request(request_rec *r)
+AP_DECLARE(void) ap_process_request(request_rec *r)
 {
     apr_bucket_brigade *bb;
     apr_bucket *b;

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep  7 17:37:19 2015
@@ -0,0 +1,23 @@
+.deps
+.libs
+*.la
+modules.mk
+Makefile
+*.lo
+*.slo
+*.so
+*.x
+Debug
+Release
+*.plg
+*.aps
+*.dep
+*.mak
+*.rc
+BuildLog.htm
+*.stc
+*.stt
+*.sto
+*.vcproj
+*.vcproj.*
+

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/.gitignore
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/Makefile.in
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README.h2 (from r1690248, httpd/httpd/trunk/modules/http2/README.h2)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README.h2?p2=httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README.h2&p1=httpd/httpd/trunk/modules/http2/README.h2&r1=1690248&r2=1701655&rev=1701655&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/README.h2 (original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README.h2 Mon Sep  7 17:37:19 2015
@@ -34,13 +34,26 @@ shared cousins.
 
 CONFIGURATION
 
-The most important configuration options is
+If mod_h2 is enabled for a site or not depends on the new "Protocols"
+directive. This directive list all protocols enabled for a server or
+virtual host.
+
+If you do not specify "Protocols" all available protocols are enabled. For
+sites using TLS, the protocol supported by mod_h2 is "h2". For cleartext
+http:, the offered protocol is "h2c".
+
+The following is an example of a server that only supports http/1.1 in
+general and offers h2 for a specific virtual host.
+
+    ...
+    Protocols http/1.1
+    <virtualhost *:443>
+        Protocols h2 http/1.1
+        ...
+    </virtualhost>
 
-    H2Engine On|Off
-
-which can be set on the base server or a virtual host. By default, the
-engine is 'Off'. Please see the documentation of mod_h2 for a complete
-list and explanation of other options.
+Please see the documentation of mod_h2 for a complete list and explanation 
+of all options.
 
 
 TLS CONFIGURATION

Propchange: httpd/httpd/branches/2.4.17-protocols-http2/modules/http2/README.h2
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message