httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1741419 [1/4] - in /httpd/httpd/branches/2.4.x: ./ modules/http2/
Date Thu, 28 Apr 2016 12:43:02 GMT
Author: icing
Date: Thu Apr 28 12:43:02 2016
New Revision: 1741419

URL: http://svn.apache.org/viewvc?rev=1741419&view=rev
Log:
mod_http2: backport of 1.5.2 to 2.4.x

Added:
    httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c
      - copied, changed from r1739303, httpd/httpd/trunk/modules/http2/h2_bucket_beam.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h
      - copied, changed from r1739303, httpd/httpd/trunk/modules/http2/h2_bucket_beam.h
Removed:
    httpd/httpd/branches/2.4.x/modules/http2/h2_int_queue.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_int_queue.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_io.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_io.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_io_set.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_io_set.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_task_input.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_task_input.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_task_output.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_task_output.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_task_queue.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_task_queue.h
Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/CMakeLists.txt
    httpd/httpd/branches/2.4.x/modules/http2/NWGNUmod_http2
    httpd/httpd/branches/2.4.x/modules/http2/config2.m4
    httpd/httpd/branches/2.4.x/modules/http2/h2.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eoc.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eos.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_filter.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_filter.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_h2.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_request.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_request.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_session.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_session.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_stream.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_task.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_task.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_util.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_util.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_version.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_worker.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_worker.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_workers.c
    httpd/httpd/branches/2.4.x/modules/http2/mod_http2.c
    httpd/httpd/branches/2.4.x/modules/http2/mod_http2.dsp

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 28 12:43:02 2016
@@ -2,4 +2,4 @@
 /httpd/httpd/branches/2.4.17-protocols-http2:1701609-1705681
 /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,1417440,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,145396
 3,1453981,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,150
 0345,1500362,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,15831
 75,1583191,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,1587607,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704,1588851,1588853,1588868,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,1599535,1601076,1601184-1601185,1601274,1601291,1601624,1601630,1601919,1601995,1602338,1602978,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,16
 18541,1619297,1619383,1619444,1619483,1619835,1620324,1620461,1620932,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,1629916,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,1653941,1653978,1653997,1656225,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448,1661464,1661486,1662245
 -1662246,1663017,1663647,1664071,1664133,1664205,1664299,1664709,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,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,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,1683044,1683047,1683123,1683881,1683884,1684057,1684171,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686856,1687539,1687680,1687
 980,1688274,1688331,1688339-1688341,1688343,1688474-1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755,1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,1701145,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1703152,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1705983,1706275,1706627,1
 706635,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710419,1710572,1710583,1710723,1711479,1711553,1711648,1711728,1711902,1712382,1713040,1713209,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-1715585,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,1718338,1718400,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899,1722137,1722154,1722572,1722701,1723122,1723143,1723284,1723295,1723567,1724847,1724857,1725149,1725325,1725392,1725394-1725395,1725445,1725468,1725485,1725516,1725940,1726009,1726026,1726086,1726167,1726233,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1729374,172937
 6,1729826,1729847,1729929-1729931,1729960,1730297,1730640,1730865,1731929,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733691,1734006,1734125,1734239,1734294,1734412,1734817,1734947,1734955,1734989,1735088,1735608-1735609,1735611,1735786,1735952,1736156,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737021,1737102,1737114,1737125,1737254,1738217,1738331,1738333,1739008,1739146,1739151,1739193,1740075,1740108
+/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,1417440,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,145396
 3,1453981,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,150
 0345,1500362,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,15831
 75,1583191,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,1587607,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704,1588851,1588853,1588868,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,1599535,1601076,1601184-1601185,1601274,1601291,1601624,1601630,1601919,1601995,1602338,1602978,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,16
 18541,1619297,1619383,1619444,1619483,1619835,1620324,1620461,1620932,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,1629916,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,1653941,1653978,1653997,1656225,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448,1661464,1661486,1662245
 -1662246,1663017,1663647,1664071,1664133,1664205,1664299,1664709,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,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,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,1683044,1683047,1683123,1683881,1683884,1684057,1684171,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686856,1687539,1687680,1687
 980,1688274,1688331,1688339-1688341,1688343,1688474-1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755,1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,1701145,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1703152,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1705983,1706275,1706627,1
 706635,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710419,1710572,1710583,1710723,1711479,1711553,1711648,1711728,1711902,1712382,1713040,1713209,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-1715585,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,1718338,1718400,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899,1722137,1722154,1722572,1722701,1723122,1723143,1723284,1723295,1723567,1724847,1724857,1725149,1725325,1725392,1725394-1725395,1725445,1725468,1725485,1725516,1725940,1726009,1726026,1726086,1726167,1726233,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1729374,172937
 6,1729826,1729847,1729929-1729931,1729960,1730297,1730640,1730865,1731929,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733691,1734006,1734125,1734239,1734294,1734412,1734817,1734947,1734955,1734989,1735088,1735608-1735609,1735611,1735786,1735952,1736156,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737021,1737102,1737114,1737125,1737254,1737256,1738217,1738331,1738333,1738563,1739008,1739146,1739151,1739193,1739303,1739312,1739738,1739932,1740075,1740084,1740108,1740155,1741045,1741112,1741115,1741268,1741392,1741414

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Apr 28 12:43:02 2016
@@ -2,6 +2,21 @@
 
 Changes with Apache 2.4.21
 
+  *) mod_http2: fixed a bug that caused mod_proxy_http2 to be called for window
+     updates on requests it had already reported done. Added synchronization
+     on early connection/stream close that lets ongoing requests safely drain
+     their input filters.
+     [Stefan Eissing]
+
+  *) mod_http2: scoreboard updates that summarize the h2 session (and replace
+     the last request information) will only happen when the session is idle or 
+     in shutdown/done phase. [Stefan Eissing]
+     
+  *) mod_http2: new "bucket beam" technology to transport buckets across
+     threads without buffer copy. Delaying response start until flush or
+     enough body data has been accumulated. Overall significanlty smaller
+     memory footprint. [Stefan Eissing]
+     
   *) core: New CGIVar directive can configure REQUEST_URI to represent the
      current URI being processed instead of always the original request.
      [Jeff Trawick]

Modified: httpd/httpd/branches/2.4.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CMakeLists.txt?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CMakeLists.txt (original)
+++ httpd/httpd/branches/2.4.x/CMakeLists.txt Thu Apr 28 12:43:02 2016
@@ -384,15 +384,13 @@ SET(mod_http2_extra_sources
   modules/http2/h2_conn.c            modules/http2/h2_conn_io.c
   modules/http2/h2_ctx.c             modules/http2/h2_filter.c
   modules/http2/h2_from_h1.c         modules/http2/h2_h2.c
-  modules/http2/h2_io.c              modules/http2/h2_io_set.c
+  modules/http2/h2_bucket_beam.c
   modules/http2/h2_mplx.c            modules/http2/h2_push.c
   modules/http2/h2_request.c         modules/http2/h2_response.c
   modules/http2/h2_session.c         modules/http2/h2_stream.c 
   modules/http2/h2_switch.c          modules/http2/h2_ngn_shed.c 
-  modules/http2/h2_task.c            modules/http2/h2_task_input.c
-  modules/http2/h2_task_output.c     modules/http2/h2_int_queue.c
-  modules/http2/h2_util.c            modules/http2/h2_worker.c
-  modules/http2/h2_workers.c
+  modules/http2/h2_task.c            modules/http2/h2_util.c
+  modules/http2/h2_worker.c          modules/http2/h2_workers.c
 )
 SET(mod_ldap_extra_defines           LDAP_DECLARE_EXPORT)
 SET(mod_ldap_extra_libs              wldap32)

Modified: httpd/httpd/branches/2.4.x/modules/http2/NWGNUmod_http2
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/NWGNUmod_http2?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/NWGNUmod_http2 (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/NWGNUmod_http2 Thu Apr 28 12:43:02 2016
@@ -185,6 +185,7 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
 	$(OBJDIR)/h2_alt_svc.o \
+	$(OBJDIR)/h2_bucket_beam.o \
 	$(OBJDIR)/h2_bucket_eoc.o \
 	$(OBJDIR)/h2_bucket_eos.o \
 	$(OBJDIR)/h2_config.o \
@@ -194,9 +195,6 @@ FILES_nlm_objs = \
 	$(OBJDIR)/h2_filter.o \
 	$(OBJDIR)/h2_from_h1.o \
 	$(OBJDIR)/h2_h2.o \
-	$(OBJDIR)/h2_int_queue.o \
-	$(OBJDIR)/h2_io.o \
-	$(OBJDIR)/h2_io_set.o \
 	$(OBJDIR)/h2_mplx.o \
 	$(OBJDIR)/h2_ngn_shed.o \
 	$(OBJDIR)/h2_push.o \
@@ -206,8 +204,6 @@ FILES_nlm_objs = \
 	$(OBJDIR)/h2_stream.o \
 	$(OBJDIR)/h2_switch.o \
 	$(OBJDIR)/h2_task.o \
-	$(OBJDIR)/h2_task_input.o \
-	$(OBJDIR)/h2_task_output.o \
 	$(OBJDIR)/h2_util.o \
 	$(OBJDIR)/h2_worker.o \
 	$(OBJDIR)/h2_workers.o \
@@ -363,7 +359,7 @@ $(OBJDIR)/mod_http2.imp : NWGNUmod_http2
 	@echo $(DL) h2_ihash_clear,$(DL) >> $@
 	@echo $(DL) h2_ihash_count,$(DL) >> $@
 	@echo $(DL) h2_ihash_create,$(DL) >> $@
-	@echo $(DL) h2_ihash_is_empty,$(DL) >> $@
+	@echo $(DL) h2_ihash_empty,$(DL) >> $@
 	@echo $(DL) h2_ihash_iter,$(DL) >> $@
 	@echo $(DL) h2_ihash_remove,$(DL) >> $@
 	@echo $(DL) h2_iq_add,$(DL) >> $@

Modified: httpd/httpd/branches/2.4.x/modules/http2/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/config2.m4?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/config2.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/config2.m4 Thu Apr 28 12:43:02 2016
@@ -20,6 +20,7 @@ dnl #  list of module object files
 http2_objs="dnl
 mod_http2.lo dnl
 h2_alt_svc.lo dnl
+h2_bucket_beam.lo dnl
 h2_bucket_eoc.lo dnl
 h2_bucket_eos.lo dnl
 h2_config.lo dnl
@@ -29,9 +30,6 @@ h2_ctx.lo dnl
 h2_filter.lo dnl
 h2_from_h1.lo dnl
 h2_h2.lo dnl
-h2_int_queue.lo dnl
-h2_io.lo dnl
-h2_io_set.lo dnl
 h2_mplx.lo dnl
 h2_ngn_shed.lo dnl
 h2_push.lo dnl
@@ -41,8 +39,6 @@ h2_session.lo dnl
 h2_stream.lo dnl
 h2_switch.lo dnl
 h2_task.lo dnl
-h2_task_input.lo dnl
-h2_task_output.lo dnl
 h2_util.lo dnl
 h2_worker.lo dnl
 h2_workers.lo dnl

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2.h?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2.h Thu Apr 28 12:43:02 2016
@@ -149,6 +149,9 @@ struct h2_response {
     const char  *sos_filter;
 };
 
+typedef apr_status_t h2_io_data_cb(void *ctx, const char *data, apr_off_t len);
+
+typedef int h2_stream_pri_cmp(int stream_id1, int stream_id2, void *ctx);
 
 /* Note key to attach connection task id to conn_rec/request_rec instances */
 

Copied: httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c (from r1739303, httpd/httpd/trunk/modules/http2/h2_bucket_beam.c)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c?p2=httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c&p1=httpd/httpd/trunk/modules/http2/h2_bucket_beam.c&r1=1739303&r2=1741419&rev=1741419&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_bucket_beam.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c Thu Apr 28 12:43:02 2016
@@ -21,32 +21,61 @@
 #include <apr_thread_cond.h>
 
 #include <httpd.h>
+#include <http_log.h>
 
+#include "h2_private.h"
 #include "h2_util.h"
 #include "h2_bucket_beam.h"
 
-static void h2_beam_emitted(h2_bucket_beam *beam, apr_bucket *bred);
+static void h2_beam_emitted(h2_bucket_beam *beam, h2_beam_proxy *proxy);
+
+#define H2_BPROXY_NEXT(e)             APR_RING_NEXT((e), link)
+#define H2_BPROXY_PREV(e)             APR_RING_PREV((e), link)
+#define H2_BPROXY_REMOVE(e)           APR_RING_REMOVE((e), link)
+
+#define H2_BPROXY_LIST_INIT(b)        APR_RING_INIT(&(b)->list, h2_beam_proxy, link);
+#define H2_BPROXY_LIST_SENTINEL(b)    APR_RING_SENTINEL(&(b)->list, h2_beam_proxy, link)
+#define H2_BPROXY_LIST_EMPTY(b)       APR_RING_EMPTY(&(b)->list, h2_beam_proxy, link)
+#define H2_BPROXY_LIST_FIRST(b)       APR_RING_FIRST(&(b)->list)
+#define H2_BPROXY_LIST_LAST(b)	      APR_RING_LAST(&(b)->list)
+#define H2_PROXY_BLIST_INSERT_HEAD(b, e) do {				\
+	h2_beam_proxy *ap__b = (e);                                        \
+	APR_RING_INSERT_HEAD(&(b)->list, ap__b, h2_beam_proxy, link);	\
+    } while (0)
+#define H2_BPROXY_LIST_INSERT_TAIL(b, e) do {				\
+	h2_beam_proxy *ap__b = (e);					\
+	APR_RING_INSERT_TAIL(&(b)->list, ap__b, h2_beam_proxy, link);	\
+    } while (0)
+#define H2_BPROXY_LIST_CONCAT(a, b) do {					\
+        APR_RING_CONCAT(&(a)->list, &(b)->list, h2_beam_proxy, link);	\
+    } while (0)
+#define H2_BPROXY_LIST_PREPEND(a, b) do {					\
+        APR_RING_PREPEND(&(a)->list, &(b)->list, h2_beam_proxy, link);	\
+    } while (0)
+
 
 /*******************************************************************************
  * beam bucket with reference to beam and bucket it represents
  ******************************************************************************/
 
-extern const apr_bucket_type_t h2_bucket_type_beam;
+const apr_bucket_type_t h2_bucket_type_beam;
 
 #define H2_BUCKET_IS_BEAM(e)     (e->type == &h2_bucket_type_beam)
 
-typedef struct {
+struct h2_beam_proxy {
     apr_bucket_refcount refcount;
+    APR_RING_ENTRY(h2_beam_proxy) link;
     h2_bucket_beam *beam;
     apr_bucket *bred;
-} h2_beam_bucket;
+    apr_size_t n;
+};
 
 static const char Dummy = '\0';
 
 static apr_status_t beam_bucket_read(apr_bucket *b, const char **str, 
                                      apr_size_t *len, apr_read_type_e block)
 {
-    h2_beam_bucket *d = b->data;
+    h2_beam_proxy *d = b->data;
     if (d->bred) {
         const char *data;
         apr_status_t status = apr_bucket_read(d->bred, &data, len, block);
@@ -58,16 +87,21 @@ static apr_status_t beam_bucket_read(apr
     }
     *str = &Dummy;
     *len = 0;
-    return APR_SUCCESS;
+    return APR_ECONNRESET;
 }
 
 static void beam_bucket_destroy(void *data)
 {
-    h2_beam_bucket *d = data;
+    h2_beam_proxy *d = data;
 
     if (apr_bucket_shared_destroy(d)) {
-        if (d->bred) {
-            h2_beam_emitted(d->beam, d->bred);
+        /* When the beam gets destroyed before this bucket, it will
+         * NULLify its reference here. This is not protected by a mutex,
+         * so it will not help with race conditions.
+         * But it lets us shut down memory pool with circulare beam
+         * references. */
+        if (d->beam) {
+            h2_beam_emitted(d->beam, d);
         }
         apr_bucket_free(d);
     }
@@ -75,14 +109,16 @@ static void beam_bucket_destroy(void *da
 
 static apr_bucket * h2_beam_bucket_make(apr_bucket *b, 
                                         h2_bucket_beam *beam,
-                                        apr_bucket *bred)
+                                        apr_bucket *bred, apr_size_t n)
 {
-    h2_beam_bucket *d;
+    h2_beam_proxy *d;
 
     d = apr_bucket_alloc(sizeof(*d), b->list);
+    H2_BPROXY_LIST_INSERT_TAIL(&beam->proxies, d);
     d->beam = beam;
     d->bred = bred;
-
+    d->n = n;
+    
     b = apr_bucket_shared_make(b, d, 0, bred? bred->length : 0);
     b->type = &h2_bucket_type_beam;
 
@@ -91,17 +127,37 @@ static apr_bucket * h2_beam_bucket_make(
 
 static apr_bucket *h2_beam_bucket_create(h2_bucket_beam *beam,
                                          apr_bucket *bred,
-                                         apr_bucket_alloc_t *list)
+                                         apr_bucket_alloc_t *list,
+                                         apr_size_t n)
 {
     apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
 
     APR_BUCKET_INIT(b);
     b->free = apr_bucket_free;
     b->list = list;
-    return h2_beam_bucket_make(b, beam, bred);
+    return h2_beam_bucket_make(b, beam, bred, n);
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t h2_bucket_type_beam = {
+/*static apr_status_t beam_bucket_setaside(apr_bucket *b, apr_pool_t *pool)
+{
+    apr_status_t status = APR_SUCCESS;
+    h2_beam_proxy *d = b->data;
+    if (d->bred) {
+        const char *data;
+        apr_size_t len;
+        
+        status = apr_bucket_read(d->bred, &data, &len, APR_BLOCK_READ);
+        if (status == APR_SUCCESS) {
+            b = apr_bucket_heap_make(b, (char *)data + b->start, b->length, NULL);
+            if (b == NULL) {
+                return APR_ENOMEM;
+            }
+        }
+    }
+    return status;
+}*/
+
+const apr_bucket_type_t h2_bucket_type_beam = {
     "BEAM", 5, APR_BUCKET_DATA,
     beam_bucket_destroy,
     beam_bucket_read,
@@ -146,22 +202,20 @@ apr_size_t h2_util_bl_print(char *buffer
  * bucket beam that can transport buckets across threads
  ******************************************************************************/
 
-static apr_status_t enter_yellow(h2_bucket_beam *beam, 
-                                 apr_thread_mutex_t **plock, int *pacquired)
+static apr_status_t enter_yellow(h2_bucket_beam *beam, h2_beam_lock *pbl)
 {
     if (beam->m_enter) {
-        return beam->m_enter(beam->m_ctx, plock, pacquired);
+        return beam->m_enter(beam->m_ctx, pbl);
     }
-    *plock = NULL;
-    *pacquired = 0;
+    pbl->mutex = NULL;
+    pbl->leave = NULL;
     return APR_SUCCESS;
 }
 
-static void leave_yellow(h2_bucket_beam *beam, 
-                         apr_thread_mutex_t *lock, int acquired)
+static void leave_yellow(h2_bucket_beam *beam, h2_beam_lock *pbl)
 {
-    if (acquired && beam->m_leave) {
-        beam->m_leave(beam->m_ctx, lock, acquired);
+    if (pbl->leave) {
+        pbl->leave(pbl->leave_ctx, pbl->mutex);
     }
 }
 
@@ -216,12 +270,12 @@ static apr_status_t wait_cond(h2_bucket_
 }
 
 static apr_status_t r_wait_space(h2_bucket_beam *beam, apr_read_type_e block,
-                                 apr_thread_mutex_t *lock, apr_off_t *premain) 
+                                 h2_beam_lock *pbl, apr_off_t *premain) 
 {
     *premain = calc_space_left(beam);
     while (!beam->aborted && *premain <= 0 
-           && (block == APR_BLOCK_READ) && lock) {
-        apr_status_t status = wait_cond(beam, lock);
+           && (block == APR_BLOCK_READ) && pbl->mutex) {
+        apr_status_t status = wait_cond(beam, pbl->mutex);
         if (APR_STATUS_IS_TIMEUP(status)) {
             return status;
         }
@@ -231,33 +285,70 @@ static apr_status_t r_wait_space(h2_buck
     return beam->aborted? APR_ECONNABORTED : APR_SUCCESS;
 }
 
-static void h2_beam_prep_purge(h2_bucket_beam *beam, apr_bucket *bred)
+static void h2_beam_emitted(h2_bucket_beam *beam, h2_beam_proxy *proxy)
 {
-    APR_BUCKET_REMOVE(bred);
-    H2_BLIST_INSERT_TAIL(&beam->purge, bred);
-}
-
-static void h2_beam_emitted(h2_bucket_beam *beam, apr_bucket *bred)
-{
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
+    apr_bucket *b, *next;
 
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         /* even when beam buckets are split, only the one where
          * refcount drops to 0 will call us */
-        --beam->live_beam_buckets;
+        H2_BPROXY_REMOVE(proxy);
         /* invoked from green thread, the last beam bucket for the red
          * bucket bred is about to be destroyed.
          * remove it from the hold, where it should be now */
-        h2_beam_prep_purge(beam, bred);
+        if (proxy->bred) {
+            for (b = H2_BLIST_FIRST(&beam->hold); 
+                 b != H2_BLIST_SENTINEL(&beam->hold);
+                 b = APR_BUCKET_NEXT(b)) {
+                 if (b == proxy->bred) {
+                    break;
+                 }
+            }
+            if (b != H2_BLIST_SENTINEL(&beam->hold)) {
+                /* bucket is in hold as it should be, mark this one
+                 * and all before it for purging. We might have placed meta
+                 * buckets without a green proxy into the hold before it 
+                 * and schedule them for purging now */
+                for (b = H2_BLIST_FIRST(&beam->hold); 
+                     b != H2_BLIST_SENTINEL(&beam->hold);
+                     b = next) {
+                    next = APR_BUCKET_NEXT(b);
+                    if (b == proxy->bred) {
+                        APR_BUCKET_REMOVE(b);
+                        H2_BLIST_INSERT_TAIL(&beam->purge, b);
+                        break;
+                    }
+                    else if (APR_BUCKET_IS_METADATA(b)) {
+                        APR_BUCKET_REMOVE(b);
+                        H2_BLIST_INSERT_TAIL(&beam->purge, b);
+                    }
+                    else {
+                        /* another data bucket before this one in hold. this
+                         * is normal since DATA buckets need not be destroyed
+                         * in order */
+                    }
+                }
+                
+                proxy->bred = NULL;
+            }
+            else {
+                /* it should be there unless we screwed up */
+                ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, beam->red_pool, 
+                              APLOGNO() "h2_beam(%d-%s): emitted bucket not "
+                              "in hold, n=%d", beam->id, beam->tag, 
+                              (int)proxy->n);
+                AP_DEBUG_ASSERT(!proxy->bred);
+            }
+        }
         /* notify anyone waiting on space to become available */
-        if (!lock) {
+        if (!bl.mutex) {
             r_purge_reds(beam);
         }
         else if (beam->m_cond) {
             apr_thread_cond_broadcast(beam->m_cond);
         }
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
 }
 
@@ -280,31 +371,45 @@ static void h2_blist_cleanup(h2_blist *b
     }
 }
 
+static apr_status_t beam_close(h2_bucket_beam *beam)
+{
+    if (!beam->closed) {
+        beam->closed = 1;
+        if (beam->m_cond) {
+            apr_thread_cond_broadcast(beam->m_cond);
+        }
+    }
+    return APR_SUCCESS;
+}
+
 static apr_status_t beam_cleanup(void *data)
 {
     h2_bucket_beam *beam = data;
-
-    AP_DEBUG_ASSERT(beam->live_beam_buckets == 0);
+    
+    beam_close(beam);
+    r_purge_reds(beam);
     h2_blist_cleanup(&beam->red);
+    report_consumption(beam);
     h2_blist_cleanup(&beam->purge);
     h2_blist_cleanup(&beam->hold);
+    
     return APR_SUCCESS;
 }
 
 apr_status_t h2_beam_destroy(h2_bucket_beam *beam)
 {
-    apr_pool_cleanup_kill(beam->life_pool, beam, beam_cleanup);
+    apr_pool_cleanup_kill(beam->red_pool, beam, beam_cleanup);
     return beam_cleanup(beam);
 }
 
-apr_status_t h2_beam_create(h2_bucket_beam **pbeam, apr_pool_t *life_pool, 
+apr_status_t h2_beam_create(h2_bucket_beam **pbeam, apr_pool_t *red_pool, 
                             int id, const char *tag, 
                             apr_size_t max_buf_size)
 {
     h2_bucket_beam *beam;
     apr_status_t status = APR_SUCCESS;
     
-    beam = apr_pcalloc(life_pool, sizeof(*beam));
+    beam = apr_pcalloc(red_pool, sizeof(*beam));
     if (!beam) {
         return APR_ENOMEM;
     }
@@ -314,11 +419,11 @@ apr_status_t h2_beam_create(h2_bucket_be
     H2_BLIST_INIT(&beam->red);
     H2_BLIST_INIT(&beam->hold);
     H2_BLIST_INIT(&beam->purge);
-    beam->life_pool = life_pool;
+    H2_BPROXY_LIST_INIT(&beam->proxies);
+    beam->red_pool = red_pool;
     beam->max_buf_size = max_buf_size;
 
-    apr_pool_cleanup_register(life_pool, beam, beam_cleanup, 
-                              apr_pool_cleanup_null);
+    apr_pool_pre_cleanup_register(red_pool, beam, beam_cleanup);
     *pbeam = beam;
     
     return status;
@@ -326,83 +431,68 @@ apr_status_t h2_beam_create(h2_bucket_be
 
 void h2_beam_buffer_size_set(h2_bucket_beam *beam, apr_size_t buffer_size)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         beam->max_buf_size = buffer_size;
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
 }
 
 apr_size_t h2_beam_buffer_size_get(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     apr_size_t buffer_size = 0;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         buffer_size = beam->max_buf_size;
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return buffer_size;
 }
 
 void h2_beam_mutex_set(h2_bucket_beam *beam, 
                        h2_beam_mutex_enter m_enter,
-                       h2_beam_mutex_leave m_leave,
                        apr_thread_cond_t *cond,
                        void *m_ctx)
 {
-    apr_thread_mutex_t *lock;
-    h2_beam_mutex_leave *prev_leave;
-    void *prev_ctx;
-    int acquired;
-    
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
-        prev_ctx = beam->m_ctx;
-        prev_leave = beam->m_leave;
+    h2_beam_lock bl;
+    
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         beam->m_enter = m_enter;
-        beam->m_leave = m_leave;
         beam->m_ctx   = m_ctx;
         beam->m_cond  = cond;
-        if (acquired && prev_leave) {
-            /* special tactics when NULLing a lock */
-            prev_leave(prev_ctx, lock, acquired);
-        }
+        leave_yellow(beam, &bl);
     }
 }
 
 void h2_beam_timeout_set(h2_bucket_beam *beam, apr_interval_time_t timeout)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         beam->timeout = timeout;
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
 }
 
 apr_interval_time_t h2_beam_timeout_get(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     apr_interval_time_t timeout = 0;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         timeout = beam->timeout;
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return timeout;
 }
 
 void h2_beam_abort(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         r_purge_reds(beam);
         h2_blist_cleanup(&beam->red);
         beam->aborted = 1;
@@ -410,67 +500,53 @@ void h2_beam_abort(h2_bucket_beam *beam)
         if (beam->m_cond) {
             apr_thread_cond_broadcast(beam->m_cond);
         }
-        leave_yellow(beam, lock, acquired);
-    }
-}
-
-static apr_status_t beam_close(h2_bucket_beam *beam)
-{
-    if (!beam->closed) {
-        beam->closed = 1;
-        if (beam->m_cond) {
-            apr_thread_cond_broadcast(beam->m_cond);
-        }
+        leave_yellow(beam, &bl);
     }
-    return APR_SUCCESS;
 }
 
 apr_status_t h2_beam_close(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         r_purge_reds(beam);
         beam_close(beam);
         report_consumption(beam);
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return beam->aborted? APR_ECONNABORTED : APR_SUCCESS;
 }
 
-void h2_beam_shutdown(h2_bucket_beam *beam)
+apr_status_t h2_beam_shutdown(h2_bucket_beam *beam, apr_read_type_e block)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    apr_status_t status;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if ((status = enter_yellow(beam, &bl)) == APR_SUCCESS) {
         r_purge_reds(beam);
         h2_blist_cleanup(&beam->red);
         beam_close(beam);
         report_consumption(beam);
-        leave_yellow(beam, lock, acquired);
-    }
-}
-
-void h2_beam_reset(h2_bucket_beam *beam)
-{
-    apr_thread_mutex_t *lock;
-    int acquired;
-    
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
-        beam_cleanup(beam);
-        beam->closed = beam->close_sent = 0;
-        beam->sent_bytes = beam->received_bytes = beam->reported_bytes = 0;
-        leave_yellow(beam, lock, acquired);
+        
+        while (status == APR_SUCCESS 
+               && (!H2_BPROXY_LIST_EMPTY(&beam->proxies)
+                   || (beam->green && !APR_BRIGADE_EMPTY(beam->green)))) {
+            if (block == APR_NONBLOCK_READ || !bl.mutex) {
+                status = APR_EAGAIN;
+                break;
+            }
+            status = wait_cond(beam, bl.mutex);
+        }
+        leave_yellow(beam, &bl);
     }
+    return status;
 }
 
 static apr_status_t append_bucket(h2_bucket_beam *beam, 
                                   apr_bucket *bred,
                                   apr_read_type_e block,
                                   apr_pool_t *pool,
-                                  apr_thread_mutex_t *lock)
+                                  h2_beam_lock *pbl)
 {
     const char *data;
     apr_size_t len;
@@ -499,7 +575,7 @@ static apr_status_t append_bucket(h2_buc
         }
         
         if (space_left < bred->length) {
-            status = r_wait_space(beam, block, lock, &space_left);
+            status = r_wait_space(beam, block, pbl, &space_left);
             if (status != APR_SUCCESS) {
                 return status;
             }
@@ -525,23 +601,33 @@ static apr_status_t append_bucket(h2_buc
          * affected by this. */
         status = apr_bucket_setaside(bred, pool);
     }
-    else if (APR_BUCKET_IS_HEAP(bred) || APR_BUCKET_IS_POOL(bred)) {
-        /* For heap/pool buckets read from a green thread is fine. The
+    else if (APR_BUCKET_IS_HEAP(bred)) {
+        /* For heap buckets read from a green thread is fine. The
          * data will be there and live until the bucket itself is
          * destroyed. */
         status = APR_SUCCESS;
     }
+    else if (APR_BUCKET_IS_POOL(bred)) {
+        /* pool buckets are bastards that register at pool cleanup
+         * to morph themselves into heap buckets. That may happen anytime,
+         * even after the bucket data pointer has been read. So at
+         * any time inside the green thread, the pool bucket memory
+         * may disappear. yikes. */
+        status = apr_bucket_read(bred, &data, &len, APR_BLOCK_READ);
+        if (status == APR_SUCCESS) {
+            apr_bucket_heap_make(bred, data, len, NULL);
+        }
+    }
     else if (APR_BUCKET_IS_FILE(bred)) {
         /* For file buckets the problem is their internal readpool that
          * is used on the first read to allocate buffer/mmap.
          * Since setting aside a file bucket will de-register the
          * file cleanup function from the previous pool, we need to
-         * call that from a red thread. Do it now and make our
-         * yellow pool the owner. 
+         * call that from a red thread. 
          * Additionally, we allow callbacks to prevent beaming file
          * handles across. The use case for this is to limit the number 
          * of open file handles and rather use a less efficient beam
-         * transport. */ 
+         * transport. */
         apr_file_t *fd = ((apr_bucket_file *)bred->data)->fd;
         int can_beam = 1;
         if (beam->last_beamed != fd && beam->can_beam_fn) {
@@ -551,13 +637,16 @@ static apr_status_t append_bucket(h2_buc
             beam->last_beamed = fd;
             status = apr_bucket_setaside(bred, pool);
         }
+        /* else: enter ENOTIMPL case below */
     }
     
     if (status == APR_ENOTIMPL) {
         /* we have no knowledge about the internals of this bucket,
-         * but on read, it needs to make the data available somehow.
-         * So we do this while still in a red thread. The data will
-         * live at least os long as the red bucket itself. */
+         * but hope that after read, its data stays immutable for the
+         * lifetime of the bucket. (see pool bucket handling above for
+         * a counter example).
+         * We do the read while in a red thread, so that the bucket may
+         * use pools/allocators safely. */
         if (space_left < APR_BUCKET_BUFF_SIZE) {
             space_left = APR_BUCKET_BUFF_SIZE;
         }
@@ -585,13 +674,12 @@ apr_status_t h2_beam_send(h2_bucket_beam
                           apr_bucket_brigade *red_brigade, 
                           apr_read_type_e block)
 {
-    apr_thread_mutex_t *lock;
     apr_bucket *bred;
     apr_status_t status = APR_SUCCESS;
-    int acquired;
+    h2_beam_lock bl;
 
     /* Called from the red thread to add buckets to the beam */
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         r_purge_reds(beam);
         
         if (beam->aborted) {
@@ -601,14 +689,14 @@ apr_status_t h2_beam_send(h2_bucket_beam
             while (!APR_BRIGADE_EMPTY(red_brigade)
                    && status == APR_SUCCESS) {
                 bred = APR_BRIGADE_FIRST(red_brigade);
-                status = append_bucket(beam, bred, block, red_brigade->p, lock);
+                status = append_bucket(beam, bred, block, beam->red_pool, &bl);
             }
             if (beam->m_cond) {
                 apr_thread_cond_broadcast(beam->m_cond);
             }
         }
         report_consumption(beam);
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return status;
 }
@@ -618,14 +706,14 @@ apr_status_t h2_beam_receive(h2_bucket_b
                              apr_read_type_e block,
                              apr_off_t readbytes)
 {
-    apr_thread_mutex_t *lock;
-    apr_bucket *bred, *bgreen;
-    int acquired, transferred = 0;
+    h2_beam_lock bl;
+    apr_bucket *bred, *bgreen, *ng;
+    int transferred = 0;
     apr_status_t status = APR_SUCCESS;
     apr_off_t remain = readbytes;
     
     /* Called from the green thread to take buckets from the beam */
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
 transfer:
         if (beam->aborted) {
             status = APR_ECONNABORTED;
@@ -683,8 +771,14 @@ transfer:
                     }
                     ++beam->files_beamed;
                 }
-                apr_brigade_insert_file(bb, fd, bred->start, bred->length, 
-                                        bb->p);
+                ng = apr_brigade_insert_file(bb, fd, bred->start, bred->length, 
+                                             bb->p);
+#if APR_HAS_MMAP
+                /* disable mmap handling as this leads to segfaults when
+                 * the underlying file is changed while memory pointer has
+                 * been handed out. See also PR 59348 */
+                apr_bucket_file_enable_mmap(ng, 0);
+#endif
                 remain -= bred->length;
                 ++transferred;
             }
@@ -694,8 +788,8 @@ transfer:
                  * the red brigade.
                  * the beam bucket will notify us on destruction that bred is
                  * no longer needed. */
-                bgreen = h2_beam_bucket_create(beam, bred, bb->bucket_alloc);
-                ++beam->live_beam_buckets;
+                bgreen = h2_beam_bucket_create(beam, bred, bb->bucket_alloc,
+                                               beam->buckets_sent++);
             }
             
             /* Place the red bucket into our hold, to be destroyed when no
@@ -741,8 +835,8 @@ transfer:
                 status = APR_EOF;
             }
         }
-        else if (block == APR_BLOCK_READ && lock && beam->m_cond) {
-            status = wait_cond(beam, lock);
+        else if (block == APR_BLOCK_READ && bl.mutex && beam->m_cond) {
+            status = wait_cond(beam, bl.mutex);
             if (status != APR_SUCCESS) {
                 goto leave;
             }
@@ -752,7 +846,7 @@ transfer:
             status = APR_EAGAIN;
         }
 leave:        
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return status;
 }
@@ -760,59 +854,78 @@ leave:
 void h2_beam_on_consumed(h2_bucket_beam *beam, 
                          h2_beam_consumed_callback *cb, void *ctx)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         beam->consumed_fn = cb;
         beam->consumed_ctx = ctx;
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
 }
 
 void h2_beam_on_file_beam(h2_bucket_beam *beam, 
                           h2_beam_can_beam_callback *cb, void *ctx)
 {
-    apr_thread_mutex_t *lock;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         beam->can_beam_fn = cb;
         beam->can_beam_ctx = ctx;
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
 }
 
 
 apr_off_t h2_beam_get_buffered(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
     apr_bucket *b;
     apr_off_t l = 0;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         for (b = H2_BLIST_FIRST(&beam->red); 
             b != H2_BLIST_SENTINEL(&beam->red);
             b = APR_BUCKET_NEXT(b)) {
             /* should all have determinate length */
             l += b->length;
         }
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
+    }
+    return l;
+}
+
+apr_off_t h2_beam_get_mem_used(h2_bucket_beam *beam)
+{
+    apr_bucket *b;
+    apr_off_t l = 0;
+    h2_beam_lock bl;
+    
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
+        for (b = H2_BLIST_FIRST(&beam->red); 
+            b != H2_BLIST_SENTINEL(&beam->red);
+            b = APR_BUCKET_NEXT(b)) {
+            if (APR_BUCKET_IS_FILE(b)) {
+                /* do not count */
+            }
+            else {
+                /* should all have determinate length */
+                l += b->length;
+            }
+        }
+        leave_yellow(beam, &bl);
     }
     return l;
 }
 
 int h2_beam_empty(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
     int empty = 1;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         empty = (H2_BLIST_EMPTY(&beam->red) 
                  && (!beam->green || APR_BRIGADE_EMPTY(beam->green)));
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return empty;
 }
@@ -824,26 +937,24 @@ int h2_beam_closed(h2_bucket_beam *beam)
 
 int h2_beam_was_received(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
     int happend = 0;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         happend = (beam->received_bytes > 0);
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return happend;
 }
 
 apr_size_t h2_beam_get_files_beamed(h2_bucket_beam *beam)
 {
-    apr_thread_mutex_t *lock;
     apr_size_t n = 0;
-    int acquired;
+    h2_beam_lock bl;
     
-    if (enter_yellow(beam, &lock, &acquired) == APR_SUCCESS) {
+    if (enter_yellow(beam, &bl) == APR_SUCCESS) {
         n = beam->files_beamed;
-        leave_yellow(beam, lock, acquired);
+        leave_yellow(beam, &bl);
     }
     return n;
 }

Copied: httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h (from r1739303, httpd/httpd/trunk/modules/http2/h2_bucket_beam.h)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h?p2=httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h&p1=httpd/httpd/trunk/modules/http2/h2_bucket_beam.h&r1=1739303&r2=1741419&rev=1741419&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_bucket_beam.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h Thu Apr 28 12:43:02 2016
@@ -139,17 +139,27 @@ apr_size_t h2_util_bl_print(char *buffer
  * technology where humans are kept inside the transporter's memory
  * buffers until the transmission is complete. Star gates use a similar trick.
  */
+
+typedef void h2_beam_mutex_leave(void *ctx,  struct apr_thread_mutex_t *lock);
+
+typedef struct {
+    apr_thread_mutex_t *mutex;
+    h2_beam_mutex_leave *leave;
+    void *leave_ctx;
+} h2_beam_lock;
+
 typedef struct h2_bucket_beam h2_bucket_beam;
 
-typedef apr_status_t h2_beam_mutex_enter(void *ctx, 
-                                         struct apr_thread_mutex_t **plock, 
-                                         int *acquired);
-typedef void h2_beam_mutex_leave(void *ctx, 
-                                 struct apr_thread_mutex_t *lock, 
-                                 int acquired);
+typedef apr_status_t h2_beam_mutex_enter(void *ctx, h2_beam_lock *pbl);
+
 typedef void h2_beam_consumed_callback(void *ctx, h2_bucket_beam *beam,
                                        apr_off_t bytes);
 
+typedef struct h2_beam_proxy h2_beam_proxy;
+typedef struct {
+    APR_RING_HEAD(h2_beam_proxy_list, h2_beam_proxy) list;
+} h2_bproxy_list;
+
 typedef int h2_beam_can_beam_callback(void *ctx, h2_bucket_beam *beam,
                                       apr_file_t *file);
 
@@ -160,15 +170,16 @@ struct h2_bucket_beam {
     h2_blist hold;
     h2_blist purge;
     apr_bucket_brigade *green;
-    apr_pool_t *life_pool;
+    h2_bproxy_list proxies;
+    apr_pool_t *red_pool;
     
     apr_size_t max_buf_size;
-    apr_size_t live_beam_buckets;
     apr_size_t files_beamed;  /* how many file handles have been set aside */
     apr_file_t *last_beamed;  /* last file beamed */
     apr_off_t sent_bytes;     /* amount of bytes send */
     apr_off_t received_bytes; /* amount of bytes received */
     apr_off_t reported_bytes; /* amount of bytes reported as consumed */
+    apr_size_t buckets_sent;
     
     unsigned int aborted : 1;
     unsigned int closed : 1;
@@ -176,7 +187,6 @@ struct h2_bucket_beam {
 
     void *m_ctx;
     h2_beam_mutex_enter *m_enter;
-    h2_beam_mutex_leave *m_leave;
     struct apr_thread_cond_t *m_cond;
     apr_interval_time_t timeout;
     
@@ -194,15 +204,22 @@ struct h2_bucket_beam {
  * that is only used inside that same mutex.
  *
  * @param pbeam will hold the created beam on return
- * @param life_pool     pool for allocating initial structure and cleanups
+ * @param red_pool      pool usable on red side, beam lifeline
  * @param buffer_size   maximum memory footprint of buckets buffered in beam, or
  *                      0 for no limitation
+ *
+ * Call from the red side only.
  */
 apr_status_t h2_beam_create(h2_bucket_beam **pbeam,
-                            apr_pool_t *life_pool, 
+                            apr_pool_t *red_pool, 
                             int id, const char *tag, 
                             apr_size_t buffer_size);
 
+/**
+ * Destroys the beam immediately without cleanup.
+ *
+ * Call from the red side only.
+ */ 
 apr_status_t h2_beam_destroy(h2_bucket_beam *beam);
 
 /**
@@ -210,6 +227,8 @@ apr_status_t h2_beam_destroy(h2_bucket_b
  * internally as long as they have not been processed by the receiving side.
  * All accepted buckets are removed from the given brigade. Will return with
  * APR_EAGAIN on non-blocking sends when not all buckets could be accepted.
+ * 
+ * Call from the red side only.
  */
 apr_status_t h2_beam_send(h2_bucket_beam *beam,  
                           apr_bucket_brigade *red_buckets, 
@@ -220,33 +239,57 @@ apr_status_t h2_beam_send(h2_bucket_beam
  * when reading past an EOS bucket. Reads can be blocking until data is 
  * available or the beam has been closed. Non-blocking calls return APR_EAGAIN
  * if no data is available.
+ *
+ * Call from the green side only.
  */
 apr_status_t h2_beam_receive(h2_bucket_beam *beam, 
                              apr_bucket_brigade *green_buckets, 
                              apr_read_type_e block,
                              apr_off_t readbytes);
 
-void h2_beam_abort(h2_bucket_beam *beam);
+/**
+ * Determine if beam is closed. May still contain buffered data. 
+ * 
+ * Call from red or green side.
+ */
+int h2_beam_closed(h2_bucket_beam *beam);
 
 /**
- * Close the beam. Does not need to be invoked if certain that an EOS bucket
- * has been sent. 
+ * Determine if beam is empty. 
+ * 
+ * Call from red or green side.
  */
-apr_status_t h2_beam_close(h2_bucket_beam *beam);
+int h2_beam_empty(h2_bucket_beam *beam);
+
+/**
+ * Abort the beam. Will cleanup any buffered buckets and answer all send
+ * and receives with APR_ECONNABORTED.
+ * 
+ * Call from the red side only.
+ */
+void h2_beam_abort(h2_bucket_beam *beam);
 
 /**
- * Empty the buffer and close.
+ * Close the beam. Sending an EOS bucket serves the same purpose. 
+ * 
+ * Call from the red side only.
  */
-void h2_beam_shutdown(h2_bucket_beam *beam);
+apr_status_t h2_beam_close(h2_bucket_beam *beam);
 
 /**
- * Reset the beam to its intial, empty state.
+ * Empty any buffered data and return APR_SUCCESS when all buckets
+ * in transit have been handled. When called with APR_BLOCK_READ and
+ * with a mutex installed, will wait until this is the case. Otherwise
+ * APR_EAGAIN is returned.
+ * If a timeout is set on the beam, waiting might also time out and
+ * return APR_ETIMEUP.
+ *
+ * Call from the red side only.
  */
-void h2_beam_reset(h2_bucket_beam *beam);
+apr_status_t h2_beam_shutdown(h2_bucket_beam *beam, apr_read_type_e block);
 
 void h2_beam_mutex_set(h2_bucket_beam *beam, 
                        h2_beam_mutex_enter m_enter,
-                       h2_beam_mutex_leave m_leave,
                        struct apr_thread_cond_t *cond,
                        void *m_ctx);
 
@@ -272,6 +315,8 @@ apr_size_t h2_beam_buffer_size_get(h2_bu
  * @param beam the beam to set the callback on
  * @param cb   the callback or NULL
  * @param ctx  the context to use in callback invocation
+ * 
+ * Call from the red side, callbacks invoked on red side.
  */
 void h2_beam_on_consumed(h2_bucket_beam *beam, 
                          h2_beam_consumed_callback *cb, void *ctx);
@@ -284,8 +329,10 @@ void h2_beam_on_file_beam(h2_bucket_beam
  */
 apr_off_t h2_beam_get_buffered(h2_bucket_beam *beam);
 
-int h2_beam_closed(h2_bucket_beam *beam);
-int h2_beam_empty(h2_bucket_beam *beam);
+/**
+ * Get the memory used by the buffered buckets, approximately.
+ */
+apr_off_t h2_beam_get_mem_used(h2_bucket_beam *beam);
 
 /**
  * Return != 0 iff (some) data from the beam has been received.

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eoc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eoc.c?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eoc.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eoc.c Thu Apr 28 12:43:02 2016
@@ -23,6 +23,7 @@
 #include <http_log.h>
 
 #include "h2_private.h"
+#include "h2.h"
 #include "h2_mplx.h"
 #include "h2_session.h"
 #include "h2_bucket_eoc.h"

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eos.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eos.c?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eos.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_eos.c Thu Apr 28 12:43:02 2016
@@ -23,6 +23,7 @@
 #include <http_log.h>
 
 #include "h2_private.h"
+#include "h2.h"
 #include "h2_mplx.h"
 #include "h2_stream.h"
 #include "h2_bucket_eos.h"
@@ -92,7 +93,7 @@ static void bucket_destroy(void *data)
     if (apr_bucket_shared_destroy(h)) {
         h2_stream *stream = h->stream;
         if (stream) {
-            h2_stream_cleanup(stream);
+            h2_stream_eos_destroy(stream);
         }
         apr_bucket_free(h);
     }

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c Thu Apr 28 12:43:02 2016
@@ -26,6 +26,7 @@
 #include <http_request.h>
 
 #include "h2_private.h"
+#include "h2.h"
 #include "h2_config.h"
 #include "h2_ctx.h"
 #include "h2_filter.h"

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.c?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.c Thu Apr 28 12:43:02 2016
@@ -254,9 +254,13 @@ static apr_status_t bucketeer_buffer(h2_
     return APR_SUCCESS;
 }
 
-apr_status_t h2_conn_io_writeb(h2_conn_io *io, apr_bucket *b)
+apr_status_t h2_conn_io_writeb(h2_conn_io *io, apr_bucket *b, int flush)
 {
     APR_BRIGADE_INSERT_TAIL(io->output, b);
+    if (flush) {
+        b = apr_bucket_flush_create(io->c->bucket_alloc);
+        APR_BRIGADE_INSERT_TAIL(io->output, b);
+    }
     return APR_SUCCESS;
 }
 
@@ -315,7 +319,7 @@ apr_status_t h2_conn_io_write_eoc(h2_con
 {
     apr_bucket *b = h2_bucket_eoc_create(io->c->bucket_alloc, session);
     APR_BRIGADE_INSERT_TAIL(io->output, b);
-    return h2_conn_io_flush_int(io, 0, 1);
+    return h2_conn_io_flush_int(io, 1, 1);
 }
 
 apr_status_t h2_conn_io_write(h2_conn_io *io, 

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.h?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_conn_io.h Thu Apr 28 12:43:02 2016
@@ -64,7 +64,7 @@ apr_status_t h2_conn_io_write(h2_conn_io
  * @param io the connection io
  * @param b the bucket to append
  */
-apr_status_t h2_conn_io_writeb(h2_conn_io *io, apr_bucket *b);
+apr_status_t h2_conn_io_writeb(h2_conn_io *io, apr_bucket *b, int flush);
 
 /**
  * Append an End-Of-Connection bucket to the output that, once destroyed,

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_filter.c?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_filter.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_filter.c Thu Apr 28 12:43:02 2016
@@ -22,6 +22,7 @@
 #include <scoreboard.h>
 
 #include "h2_private.h"
+#include "h2.h"
 #include "h2_conn_io.h"
 #include "h2_ctx.h"
 #include "h2_mplx.h"
@@ -208,18 +209,27 @@ static apr_status_t bbout(apr_bucket_bri
     return rv;
 }
 
-static apr_status_t h2_sos_h2_status_buffer(h2_sos *sos, apr_bucket_brigade *bb)
+static apr_status_t h2_status_stream_filter(h2_stream *stream)
 {
-    h2_stream *stream = sos->stream;
     h2_session *session = stream->session;
     h2_mplx *mplx = session->mplx;
+    conn_rec *c = session->c;
     h2_push_diary *diary;
+    apr_bucket_brigade *bb;
     apr_status_t status;
     
-    if (!bb) {
-        bb = apr_brigade_create(stream->pool, session->c->bucket_alloc);
+    if (!stream->response) {
+        return APR_EINVAL;
     }
     
+    if (!stream->buffer) {
+        stream->buffer = apr_brigade_create(stream->pool, c->bucket_alloc);
+    }
+    bb = stream->buffer;
+    
+    apr_table_unset(stream->response->headers, "Content-Length");
+    stream->response->content_length = -1;
+    
     bbout(bb, "{\n");
     bbout(bb, "  \"HTTP2\": \"on\",\n");
     bbout(bb, "  \"H2PUSH\": \"%s\",\n", h2_session_push_enabled(session)? "on" : "off");
@@ -266,57 +276,15 @@ static apr_status_t h2_sos_h2_status_buf
     bbout(bb, "  \"bytes_sent\": %"APR_UINT64_T_FMT"\n", session->io.bytes_written);
     bbout(bb, "}\n");
     
-    return sos->prev->buffer(sos->prev, bb);
-}
-
-static apr_status_t h2_sos_h2_status_read_to(h2_sos *sos, apr_bucket_brigade *bb, 
-                                             apr_off_t *plen, int *peos)
-{
-    return sos->prev->read_to(sos->prev, bb, plen, peos);
-}
-
-static apr_status_t h2_sos_h2_status_prepare(h2_sos *sos, apr_off_t *plen, int *peos)
-{
-    return sos->prev->prepare(sos->prev, plen, peos);
-}
-
-static apr_status_t h2_sos_h2_status_readx(h2_sos *sos, h2_io_data_cb *cb, void *ctx,
-                                           apr_off_t *plen, int *peos)
-{
-    return sos->prev->readx(sos->prev, cb, ctx, plen, peos);
-}
-
-static apr_table_t *h2_sos_h2_status_get_trailers(h2_sos *sos)
-{
-    return sos->prev->get_trailers(sos->prev);
-}
-
-static h2_sos *h2_sos_h2_status_create(h2_sos *prev) 
-{
-    h2_sos *sos;
-    h2_response *response = prev->response;
-    
-    apr_table_unset(response->headers, "Content-Length");
-    response->content_length = -1;
-
-    sos = apr_pcalloc(prev->stream->pool, sizeof(*sos));
-    sos->prev         = prev;
-    sos->response     = response;
-    sos->stream       = prev->stream;
-    sos->buffer       = h2_sos_h2_status_buffer;
-    sos->prepare      = h2_sos_h2_status_prepare;
-    sos->readx        = h2_sos_h2_status_readx;
-    sos->read_to      = h2_sos_h2_status_read_to;
-    sos->get_trailers = h2_sos_h2_status_get_trailers;
-    
-    return sos;
+    return APR_SUCCESS;
 }
 
-h2_sos *h2_filter_sos_create(const char *name, struct h2_sos *prev)
+apr_status_t h2_stream_filter(h2_stream *stream)
 {
-    if (!strcmp(H2_SOS_H2_STATUS, name)) {
-        return h2_sos_h2_status_create(prev);
+    const char *fname = stream->response? stream->response->sos_filter : NULL; 
+    if (fname && !strcmp(H2_SOS_H2_STATUS, fname)) {
+        return h2_status_stream_filter(stream);
     }
-    return prev;
+    return APR_SUCCESS;
 }
 

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_filter.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_filter.h?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_filter.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_filter.h Thu Apr 28 12:43:02 2016
@@ -43,35 +43,9 @@ apr_status_t h2_filter_core_input(ap_fil
                                   apr_read_type_e block,
                                   apr_off_t readbytes);
 
-typedef struct h2_sos h2_sos;
-typedef apr_status_t h2_sos_data_cb(void *ctx, const char *data, apr_off_t len);
-
-typedef apr_status_t h2_sos_buffer(h2_sos *sos, apr_bucket_brigade *bb);
-typedef apr_status_t h2_sos_prepare(h2_sos *sos, apr_off_t *plen, int *peos);
-typedef apr_status_t h2_sos_readx(h2_sos *sos, h2_sos_data_cb *cb, 
-                                  void *ctx, apr_off_t *plen, int *peos);
-typedef apr_status_t h2_sos_read_to(h2_sos *sos, apr_bucket_brigade *bb, 
-                                    apr_off_t *plen, int *peos);
-typedef apr_table_t *h2_sos_get_trailers(h2_sos *sos);
-
-
 #define H2_RESP_SOS_NOTE     "h2-sos-filter"
 
-struct h2_sos {
-    struct h2_stream *stream;
-    h2_sos           *prev;
-    struct h2_response *response;
-    void             *ctx;
-    h2_sos_buffer    *buffer;
-    h2_sos_prepare   *prepare;
-    h2_sos_readx     *readx;
-    h2_sos_read_to   *read_to;
-    h2_sos_get_trailers *get_trailers;
-};
-
-h2_sos *h2_filter_sos_create(const char *name, struct h2_sos *prev); 
-
+apr_status_t h2_stream_filter(struct h2_stream *stream);
 int h2_filter_h2_status_handler(request_rec *r);
 
-
 #endif /* __mod_h2__h2_filter__ */

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c Thu Apr 28 12:43:02 2016
@@ -31,7 +31,6 @@
 #include "h2_response.h"
 #include "h2_from_h1.h"
 #include "h2_task.h"
-#include "h2_task_output.h"
 #include "h2_util.h"
 
 
@@ -473,7 +472,7 @@ static h2_response *create_response(h2_f
 apr_status_t h2_response_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 {
     h2_task *task = f->ctx;
-    h2_from_h1 *from_h1 = task->output? task->output->from_h1 : NULL;
+    h2_from_h1 *from_h1 = task->output.from_h1;
     request_rec *r = f->r;
     apr_bucket *b;
     ap_bucket_error *eb = NULL;
@@ -483,7 +482,7 @@ apr_status_t h2_response_output_filter(a
     ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, f->c,
                   "h2_from_h1(%d): output_filter called", from_h1->stream_id);
     
-    if (r->header_only && task->output && from_h1->response) {
+    if (r->header_only && from_h1->response) {
         /* throw away any data after we have compiled the response */
         apr_brigade_cleanup(bb);
         return OK;
@@ -552,7 +551,7 @@ apr_status_t h2_response_output_filter(a
 apr_status_t h2_response_trailers_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 {
     h2_task *task = f->ctx;
-    h2_from_h1 *from_h1 = task->output? task->output->from_h1 : NULL;
+    h2_from_h1 *from_h1 = task->output.from_h1;
     request_rec *r = f->r;
     apr_bucket *b;
  

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_h2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_h2.c?rev=1741419&r1=1741418&r2=1741419&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_h2.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_h2.c Thu Apr 28 12:43:02 2016
@@ -86,7 +86,7 @@ const char *h2_h2_err_description(unsign
     if (h2_error < (sizeof(h2_err_descr)/sizeof(h2_err_descr[0]))) {
         return h2_err_descr[h2_error];
     }
-    return "unknown http/2 errotr code";
+    return "unknown http/2 error code";
 }
 
 /*******************************************************************************
@@ -680,7 +680,6 @@ static int h2_h2_post_read_req(request_r
         struct h2_task *task = h2_ctx_get_task(ctx);
         /* This hook will get called twice on internal redirects. Take care
          * that we manipulate filters only once. */
-        /* our slave connection? */
         if (task && !task->filters_set) {
             ap_filter_t *f;
             



Mime
View raw message