Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5E4DE200BAA for ; Thu, 27 Oct 2016 18:54:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5CD13160AF6; Thu, 27 Oct 2016 16:54:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2F7BC160AE6 for ; Thu, 27 Oct 2016 18:54:19 +0200 (CEST) Received: (qmail 80632 invoked by uid 500); 27 Oct 2016 16:54:18 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 80622 invoked by uid 99); 27 Oct 2016 16:54:18 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2016 16:54:18 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id A893B1A9545 for ; Thu, 27 Oct 2016 16:54:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id c1S4_soR0FFu for ; Thu, 27 Oct 2016 16:54:06 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 37BA15F1B3 for ; Thu, 27 Oct 2016 16:54:05 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 8A4FFE08C9 for ; Thu, 27 Oct 2016 16:53:59 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6008D3A0233 for ; Thu, 27 Oct 2016 16:53:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1766856 - in /httpd/httpd/branches/2.4.x: ./ modules/http2/ Date: Thu, 27 Oct 2016 16:53:58 -0000 To: cvs@httpd.apache.org From: icing@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161027165359.6008D3A0233@svn01-us-west.apache.org> archived-at: Thu, 27 Oct 2016 16:54:21 -0000 Author: icing Date: Thu Oct 27 16:53:58 2016 New Revision: 1766856 URL: http://svn.apache.org/viewvc?rev=1766856&view=rev Log: Merge of r1765328,1766424,1766691,1766851 from trunk: mod_http2: v1.7.7, connection shutdown revisited, AP_DEBUG_ASSERT transformed to real asserts Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/CHANGES httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h httpd/httpd/branches/2.4.x/modules/http2/h2_config.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_ctx.c httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.c httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.h httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_session.c httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_util.c httpd/httpd/branches/2.4.x/modules/http2/h2_session.c 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_version.h httpd/httpd/branches/2.4.x/modules/http2/h2_workers.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 16:53:58 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,1396440,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,1 407528,1407853,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-145387 6,1453963,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,150 0323,1500345,1500362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506474,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-15830 08,1583027,1583175,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,16 17018,1618401,1618541,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,1687 539,1687680,1687980,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,1 706275,1706627,1706635,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,1715886,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,1722177,1722195,1722229,1722320,1722328,1722334,1722350-1722351,1722358,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723567,1723953,1724847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,1725325,1725328,1725387,172539 2,1725394-1725395,1725445,1725468,1725485,1725489,1725498-1725499,1725516,1725523,1725545,1725567,1725581,1725602,1725822,1725940,1725967,1726009,1726026,1726038,1726049,1726051-1726052,1726055,1726086,1726167,1726233,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1728326,1729208,1729374,1729376,1729826,1729847,1729929-1729931,1729960,1730297,1730640,1730723,1730865,1731929,1732228,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733537,1733691,1734006,1734125,1734239,1734294,1734412,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-1735609,1735611,1735668,1735786,1735931,1735935,1735942,1735952,1736156,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1738217,1738331,1738333,1738563,1739008,1739146,1739151,1739193,1739303,1739312,1739738,1739932,1740075,1740084,174 0108,1740110,1740155,1740735,1741045,1741065,1741112,1741115,1741268,1741310,1741392,1741414,1741446,1741461,1741557,1741564,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-1742447,1742460,1742791-1742792,1743335,1743517,1743699,1743788,1743816,1744203-1744204,1744206,1744283,1744415,1744421,1744458-1744459,1744712,1744751,1744767,1744778,1744980,1745034,1745175,1745767,1745835,1746207,1746647,1746988,1747170,1747531,1747550,1747735,1747808,1747810,1747946,1748047,1748155,1748368,1748448,1748531,1748653,1748888,1749151,1749401,1749404,1749505,1749658-1749659,1749676,1749678,1749695,1749924-1749925,1750043,1750218,1750335,1750392,1750407,1750412,1750416,1750420,1750474,1750494,1750507-1750508,1750553,1750567,1750750,1750779,1750854-1750855,1750947,1750955,1750960,1751970,1752087,1752096,1752145,1752347,1752415,1753167,1753224,1753228-1753229,1753257,1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754391,1754399,1754414,1754534,1755323,1756038, 1756611,1756844,1756846,1756852-1756853,1757010-1757011,1757524,1757534,1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759984,1760018,1761434,1761477,1761479,1761548,1762517,1762703,1763158,1763246,1763613,1764005,1764040,1764236,1764243,1764255,1765318,1765357,1765420,1766097,1766129,1766308 +/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,1396440,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,1 407528,1407853,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-145387 6,1453963,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,150 0323,1500345,1500362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506474,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-15830 08,1583027,1583175,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,16 17018,1618401,1618541,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,1687 539,1687680,1687980,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,1 706275,1706627,1706635,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,1715886,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,1722177,1722195,1722229,1722320,1722328,1722334,1722350-1722351,1722358,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723567,1723953,1724847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,1725325,1725328,1725387,172539 2,1725394-1725395,1725445,1725468,1725485,1725489,1725498-1725499,1725516,1725523,1725545,1725567,1725581,1725602,1725822,1725940,1725967,1726009,1726026,1726038,1726049,1726051-1726052,1726055,1726086,1726167,1726233,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1728326,1729208,1729374,1729376,1729826,1729847,1729929-1729931,1729960,1730297,1730640,1730723,1730865,1731929,1732228,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733537,1733691,1734006,1734125,1734239,1734294,1734412,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-1735609,1735611,1735668,1735786,1735931,1735935,1735942,1735952,1736156,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1738217,1738331,1738333,1738563,1739008,1739146,1739151,1739193,1739303,1739312,1739738,1739932,1740075,1740084,174 0108,1740110,1740155,1740735,1741045,1741065,1741112,1741115,1741268,1741310,1741392,1741414,1741446,1741461,1741557,1741564,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-1742447,1742460,1742791-1742792,1743335,1743517,1743699,1743788,1743816,1744203-1744204,1744206,1744283,1744415,1744421,1744458-1744459,1744712,1744751,1744767,1744778,1744980,1745034,1745175,1745767,1745835,1746207,1746647,1746988,1747170,1747531,1747550,1747735,1747808,1747810,1747946,1748047,1748155,1748368,1748448,1748531,1748653,1748888,1749151,1749401,1749404,1749505,1749658-1749659,1749676,1749678,1749695,1749924-1749925,1750043,1750218,1750335,1750392,1750407,1750412,1750416,1750420,1750474,1750494,1750507-1750508,1750553,1750567,1750750,1750779,1750854-1750855,1750947,1750955,1750960,1751970,1752087,1752096,1752145,1752347,1752415,1753167,1753224,1753228-1753229,1753257,1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754391,1754399,1754414,1754534,1755323,1756038, 1756611,1756844,1756846,1756852-1756853,1757010-1757011,1757524,1757534,1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759984,1760018,1761434,1761477,1761479,1761548,1762517,1762703,1763158,1763246,1763613,1764005,1764040,1764236,1764243,1764255,1765318,1765328,1765357,1765420,1766097,1766129,1766308,1766424,1766691,1766851 Modified: httpd/httpd/branches/2.4.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Oct 27 16:53:58 2016 @@ -2,6 +2,13 @@ Changes with Apache 2.4.24 + *) mod_http2: connection shutdown revisited: corrected edge cases on + shutting down ongoing streams, changed log warnings to be less noisy + when waiting on long running tasks. [Stefan Eissing] + + *) mod_http2: changed all AP_DEBUG_ASSERT to ap_assert to have them + available also in normal deployments. [Stefan Eissing] + *) mod_http2/mod_proxy_http2: 100-continue handling now properly implemented up to the backend. Reused HTTP/2 proxy connections with more than a second not used will block request bodies until a PING answer is received. Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.c Thu Oct 27 16:53:58 2016 @@ -377,7 +377,7 @@ static void h2_beam_emitted(h2_bucket_be APLOGNO(03384) "h2_beam(%d-%s): emitted bucket not " "in hold, n=%d", beam->id, beam->tag, (int)proxy->n); - AP_DEBUG_ASSERT(!proxy->bred); + ap_assert(!proxy->bred); } } /* notify anyone waiting on space to become available */ @@ -413,6 +413,32 @@ static apr_status_t beam_close(h2_bucket } static void beam_set_red_pool(h2_bucket_beam *beam, apr_pool_t *pool); +static void beam_set_green_pool(h2_bucket_beam *beam, apr_pool_t *pool); + +static apr_status_t beam_green_cleanup(void *data) +{ + h2_bucket_beam *beam = data; + + if (beam->green) { + apr_brigade_destroy(beam->green); + beam->green = NULL; + } + beam->green_pool = NULL; + return APR_SUCCESS; +} + +static void beam_set_green_pool(h2_bucket_beam *beam, apr_pool_t *pool) +{ + if (beam->green_pool != pool) { + if (beam->green_pool) { + apr_pool_cleanup_kill(beam->green_pool, beam, beam_green_cleanup); + } + beam->green_pool = pool; + if (beam->green_pool) { + apr_pool_pre_cleanup_register(beam->green_pool, beam, beam_green_cleanup); + } + } +} static apr_status_t beam_red_cleanup(void *data) { @@ -429,8 +455,7 @@ static apr_status_t beam_red_cleanup(voi } h2_blist_cleanup(&beam->purge); h2_blist_cleanup(&beam->hold); - beam_set_red_pool(beam, NULL); - + beam->red_pool = NULL; return APR_SUCCESS; } @@ -453,10 +478,16 @@ static apr_status_t beam_cleanup(void *d apr_status_t status; beam_close(beam); + if (beam->green_pool) { + apr_pool_cleanup_kill(beam->green_pool, beam, beam_green_cleanup); + status = beam_green_cleanup(beam); + } + if (beam->red_pool) { + apr_pool_cleanup_kill(beam->red_pool, beam, beam_red_cleanup); status = beam_red_cleanup(beam); } - return APR_SUCCESS; + return status; } apr_status_t h2_beam_destroy(h2_bucket_beam *beam) @@ -582,27 +613,15 @@ apr_status_t h2_beam_close(h2_bucket_bea return beam->aborted? APR_ECONNABORTED : APR_SUCCESS; } -apr_status_t h2_beam_shutdown(h2_bucket_beam *beam, apr_read_type_e block, - int clear_buffers) +apr_status_t h2_beam_wait_empty(h2_bucket_beam *beam, apr_read_type_e block) { apr_status_t status; h2_beam_lock bl; if ((status = enter_yellow(beam, &bl)) == APR_SUCCESS) { - if (clear_buffers) { - r_purge_reds(beam); - h2_blist_cleanup(&beam->red); - if (!bl.mutex && beam->green) { - /* not protected, may process green in red call */ - apr_brigade_destroy(beam->green); - beam->green = NULL; - } - } - beam_close(beam); - - while (status == APR_SUCCESS - && (!H2_BPROXY_LIST_EMPTY(&beam->proxies) - || (beam->green && !APR_BRIGADE_EMPTY(beam->green)))) { + while (status == APR_SUCCESS + && !H2_BLIST_EMPTY(&beam->red) + && !H2_BPROXY_LIST_EMPTY(&beam->proxies)) { if (block == APR_NONBLOCK_READ || !bl.mutex) { status = APR_EAGAIN; break; @@ -810,6 +829,7 @@ transfer: } /* transfer enough buckets from our green brigade, if we have one */ + beam_set_green_pool(beam, bb->p); while (beam->green && !APR_BRIGADE_EMPTY(beam->green) && (readbytes <= 0 || remain >= 0)) { @@ -1068,11 +1088,6 @@ int h2_beam_holds_proxies(h2_bucket_beam return has_proxies; } -int h2_beam_closed(h2_bucket_beam *beam) -{ - return beam->closed; -} - int h2_beam_was_received(h2_bucket_beam *beam) { int happend = 0; Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_bucket_beam.h Thu Oct 27 16:53:58 2016 @@ -88,7 +88,7 @@ apr_size_t h2_util_bl_print(char *buffer * Care needs to be taken when terminating the beam. The beam registers at * the pool it was created with and will cleanup after itself. However, if * received buckets do still exist, already freed memory might be accessed. - * The beam does a AP_DEBUG_ASSERT on this condition. + * The beam does a assertion on this condition. * * The proper way of shutting down a beam is to first make sure there are no * more green buckets out there, then cleanup the beam to purge eventually @@ -179,6 +179,7 @@ struct h2_bucket_beam { apr_bucket_brigade *green; h2_bproxy_list proxies; apr_pool_t *red_pool; + apr_pool_t *green_pool; apr_size_t max_buf_size; apr_interval_time_t timeout; @@ -260,13 +261,6 @@ apr_status_t h2_beam_receive(h2_bucket_b apr_off_t readbytes); /** - * Determine if beam is closed. May still contain buffered data. - * - * Call from red or green side. - */ -int h2_beam_closed(h2_bucket_beam *beam); - -/** * Determine if beam is empty. * * Call from red or green side. @@ -305,8 +299,7 @@ apr_status_t h2_beam_close(h2_bucket_bea * * Call from the red side only. */ -apr_status_t h2_beam_shutdown(h2_bucket_beam *beam, apr_read_type_e block, - int clear_buffers); +apr_status_t h2_beam_wait_empty(h2_bucket_beam *beam, apr_read_type_e block); void h2_beam_mutex_set(h2_bucket_beam *beam, h2_beam_mutex_enter m_enter, Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_config.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_config.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_config.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_config.c Thu Oct 27 16:53:58 2016 @@ -198,7 +198,7 @@ const h2_config *h2_config_sget(server_r { h2_config *cfg = (h2_config *)ap_get_module_config(s->module_config, &http2_module); - AP_DEBUG_ASSERT(cfg); + ap_assert(cfg); return cfg; } 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=1766856&r1=1766855&r2=1766856&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 Oct 27 16:53:58 2016 @@ -248,7 +248,7 @@ conn_rec *h2_slave_create(conn_rec *mast conn_rec *c; void *cfg; - AP_DEBUG_ASSERT(master); + ap_assert(master); ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, master, "h2_conn(%ld): create slave", master->id); 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=1766856&r1=1766855&r2=1766856&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 Oct 27 16:53:58 2016 @@ -206,7 +206,7 @@ static apr_status_t read_to_scratch(h2_c return APR_SUCCESS; } - AP_DEBUG_ASSERT(b->length <= (io->ssize - io->slen)); + ap_assert(b->length <= (io->ssize - io->slen)); if (APR_BUCKET_IS_FILE(b)) { apr_bucket_file *f = (apr_bucket_file *)b->data; apr_file_t *fd = f->fd; Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_ctx.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_ctx.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_ctx.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_ctx.c Thu Oct 27 16:53:58 2016 @@ -27,7 +27,7 @@ static h2_ctx *h2_ctx_create(const conn_rec *c) { h2_ctx *ctx = apr_pcalloc(c->pool, sizeof(h2_ctx)); - AP_DEBUG_ASSERT(ctx); + ap_assert(ctx); ap_set_module_config(c->conn_config, &http2_module, ctx); h2_ctx_server_set(ctx, c->base_server); return ctx; @@ -35,7 +35,7 @@ static h2_ctx *h2_ctx_create(const conn_ void h2_ctx_clear(const conn_rec *c) { - AP_DEBUG_ASSERT(c); + ap_assert(c); ap_set_module_config(c->conn_config, &http2_module, NULL); } 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=1766856&r1=1766855&r2=1766856&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 Oct 27 16:53:58 2016 @@ -727,7 +727,7 @@ apr_status_t h2_filter_request_in(ap_fil ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, f->r, "h2_task(%s): request filter, exp=%d", task->id, r->expecting_100); - if (!task->input.chunked) { + if (!task->request->chunked) { status = ap_get_brigade(f->next, bb, mode, block, readbytes); /* pipe data through, just take care of trailers */ for (b = APR_BRIGADE_FIRST(bb); Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c Thu Oct 27 16:53:58 2016 @@ -90,14 +90,14 @@ static apr_status_t enter_mutex(h2_mplx * This allow recursive entering of the mutex from the saem thread, * which is what we need in certain situations involving callbacks */ - AP_DEBUG_ASSERT(m); + ap_assert(m); apr_threadkey_private_get(&mutex, thread_lock); if (mutex == m->lock) { *pacquired = 0; return APR_SUCCESS; } - AP_DEBUG_ASSERT(m->lock); + ap_assert(m->lock); status = apr_thread_mutex_lock(m->lock); *pacquired = (status == APR_SUCCESS); if (*pacquired) { @@ -221,13 +221,12 @@ static void purge_streams(h2_mplx *m) /* repeat until empty */ } h2_ihash_clear(m->spurge); - AP_DEBUG_ASSERT(h2_ihash_empty(m->spurge)); } } static void h2_mplx_destroy(h2_mplx *m) { - AP_DEBUG_ASSERT(m); + ap_assert(m); ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c, "h2_mplx(%ld): destroy, tasks=%d", m->id, (int)h2_ihash_count(m->tasks)); @@ -256,7 +255,7 @@ h2_mplx *h2_mplx_create(conn_rec *c, apr apr_status_t status = APR_SUCCESS; apr_allocator_t *allocator = NULL; h2_mplx *m; - AP_DEBUG_ASSERT(conf); + ap_assert(conf); status = apr_allocator_create(&allocator); if (status != APR_SUCCESS) { @@ -353,7 +352,6 @@ static void task_destroy(h2_mplx *m, h2_ { conn_rec *slave = NULL; int reuse_slave = 0; - apr_status_t status; ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, m->c, "h2_task(%s): destroy", task->id); @@ -365,22 +363,14 @@ static void task_destroy(h2_mplx *m, h2_ } } - /* The pool is cleared/destroyed which also closes all - * allocated file handles. Give this count back to our - * file handle pool. */ if (task->output.beam) { - m->tx_handles_reserved += - h2_beam_get_files_beamed(task->output.beam); h2_beam_on_produced(task->output.beam, NULL, NULL); - status = h2_beam_shutdown(task->output.beam, APR_NONBLOCK_READ, 1); - if (status != APR_SUCCESS){ - ap_log_cerror(APLOG_MARK, APLOG_WARNING, status, m->c, - APLOGNO(03385) "h2_task(%s): output shutdown " - "incomplete, beam empty=%d, holds proxies=%d", - task->id, - h2_beam_empty(task->output.beam), - h2_beam_holds_proxies(task->output.beam)); - } + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, m->c, + APLOGNO(03385) "h2_task(%s): destroy " + "output beam empty=%d, holds proxies=%d", + task->id, + h2_beam_empty(task->output.beam), + h2_beam_holds_proxies(task->output.beam)); } slave = task->c; @@ -452,6 +442,9 @@ static void stream_done(h2_mplx *m, h2_s /* Remove mutex after, so that abort still finds cond to signal */ h2_beam_mutex_set(stream->input, NULL, NULL, NULL); } + if (stream->output) { + m->tx_handles_reserved += h2_beam_get_files_beamed(stream->output); + } h2_stream_cleanup(stream); task = h2_ihash_get(m->tasks, stream->id); @@ -513,7 +506,7 @@ static int task_print(void *ctx, void *v if (task) { h2_stream *stream = h2_ihash_get(m->streams, task->stream_id); - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */ + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, m->c, /* NO APLOGNO */ "->03198: h2_stream(%s): %s %s %s" "[orph=%d/started=%d/done=%d/frozen=%d]", task->id, task->request->method, @@ -522,11 +515,11 @@ static int task_print(void *ctx, void *v task->worker_done, task->frozen); } else if (task) { - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */ + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, m->c, /* NO APLOGNO */ "->03198: h2_stream(%ld-%d): NULL", m->id, task->stream_id); } else { - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */ + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, m->c, /* NO APLOGNO */ "->03198: h2_stream(%ld-NULL): NULL", m->id); } return 1; @@ -535,14 +528,16 @@ static int task_print(void *ctx, void *v static int task_abort_connection(void *ctx, void *val) { h2_task *task = val; - if (task->c) { - task->c->aborted = 1; - } - if (task->input.beam) { - h2_beam_abort(task->input.beam); - } - if (task->output.beam) { - h2_beam_abort(task->output.beam); + if (!task->worker_done) { + if (task->c) { + task->c->aborted = 1; + } + if (task->input.beam) { + h2_beam_abort(task->input.beam); + } + if (task->output.beam) { + h2_beam_abort(task->output.beam); + } } return 1; } @@ -551,124 +546,97 @@ static int report_stream_iter(void *ctx, h2_mplx *m = ctx; h2_stream *stream = val; ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c, - "h2_mplx(%ld-%d): exists, started=%d, scheduled=%d, " - "ready=%d", + "h2_mplx(%ld-%d): exists, started=%d, scheduled=%d, ready=%d", m->id, stream->id, stream->started, stream->scheduled, h2_stream_is_ready(stream)); return 1; } +static int task_done_iter(void *ctx, void *val); + apr_status_t h2_mplx_release_and_join(h2_mplx *m, apr_thread_cond_t *wait) { apr_status_t status; int acquired; + /* How to shut down a h2 connection: + * 1. tell the workers that no more tasks will come from us */ h2_workers_unregister(m->workers, m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { - int i, wait_secs = 5; + int i, wait_secs = 60; - if (!h2_ihash_empty(m->streams) && APLOGctrace1(m->c)) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c, - "h2_mplx(%ld): release_join with %d streams open, " - "%d streams ready, %d tasks", - m->id, (int)h2_ihash_count(m->streams), - (int)h2_ihash_count(m->sready), - (int)h2_ihash_count(m->tasks)); - h2_ihash_iter(m->streams, report_stream_iter, m); - } - - /* disable WINDOW_UPDATE callbacks */ + /* 2. disable WINDOW_UPDATEs and set the mplx to aborted, clear + * our TODO list and purge any streams we have collected */ h2_mplx_set_consumed_cb(m, NULL, NULL); - - if (!h2_ihash_empty(m->shold)) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, - "h2_mplx(%ld): start release_join with %d streams in hold", - m->id, (int)h2_ihash_count(m->shold)); - } - if (!h2_ihash_empty(m->spurge)) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, - "h2_mplx(%ld): start release_join with %d streams to purge", - m->id, (int)h2_ihash_count(m->spurge)); - } - + h2_mplx_abort(m); h2_iq_clear(m->q); + purge_streams(m); + + /* 3. mark all slave connections as aborted and wakeup all sleeping + * tasks. Mark all still active streams as 'done'. m->streams has to + * be empty afterwards with streams either in + * a) m->shold because a task is still active + * b) m->spurge because task is done, or was not started */ + h2_ihash_iter(m->tasks, task_abort_connection, m); apr_thread_cond_broadcast(m->task_thawed); while (!h2_ihash_iter(m->streams, stream_done_iter, m)) { /* iterate until all streams have been removed */ } - AP_DEBUG_ASSERT(h2_ihash_empty(m->streams)); - - if (!h2_ihash_empty(m->shold)) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, - "h2_mplx(%ld): 2. release_join with %d streams in " - "hold, %d workers busy, %d tasks", - m->id, (int)h2_ihash_count(m->shold), - m->workers_busy, - (int)h2_ihash_count(m->tasks)); - } - if (!h2_ihash_empty(m->spurge)) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, - "h2_mplx(%ld): 2. release_join with %d streams to purge", - m->id, (int)h2_ihash_count(m->spurge)); - } + ap_assert(h2_ihash_empty(m->streams)); + + /* 4. purge all streams we collected by marking them 'done' */ + purge_streams(m); - /* If we still have busy workers, we cannot release our memory - * pool yet, as tasks have references to us. - * Any operation on the task slave connection will from now on - * be errored ECONNRESET/ABORTED, so processing them should fail - * and workers *should* return in a timely fashion. - */ + /* 5. while workers are busy on this connection, meaning they + * are processing tasks from this connection, wait on them finishing + * to wake us and check again. Eventually, this has to succeed. */ + m->join_wait = wait; for (i = 0; m->workers_busy > 0; ++i) { - h2_ihash_iter(m->tasks, task_abort_connection, m); - - m->join_wait = wait; status = apr_thread_cond_timedwait(wait, m->lock, apr_time_from_sec(wait_secs)); if (APR_STATUS_IS_TIMEUP(status)) { - if (i > 0) { - /* Oh, oh. Still we wait for assigned workers to report that - * they are done. Unless we have a bug, a worker seems to be hanging. - * If we exit now, all will be deallocated and the worker, once - * it does return, will walk all over freed memory... - */ - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(03198) - "h2_mplx(%ld): release, waiting for %d seconds now for " - "%d h2_workers to return, have still %d tasks outstanding", - m->id, i*wait_secs, m->workers_busy, - (int)h2_ihash_count(m->tasks)); - if (i == 1) { - h2_ihash_iter(m->tasks, task_print, m); - } - } - h2_mplx_abort(m); - apr_thread_cond_broadcast(m->task_thawed); + /* This can happen if we have very long running requests + * that do not time out on IO. */ + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, m->c, APLOGNO(03198) + "h2_mplx(%ld): release, waiting for %d seconds now for " + "%d h2_workers to return, have still %d tasks outstanding", + m->id, i*wait_secs, m->workers_busy, + (int)h2_ihash_count(m->tasks)); + h2_ihash_iter(m->shold, report_stream_iter, m); + h2_ihash_iter(m->tasks, task_print, m); } + purge_streams(m); } + m->join_wait = NULL; - if (!h2_ihash_empty(m->tasks) && APLOGctrace1(m->c)) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c, + /* 6. All workers for this connection are done, we are in + * single-threaded processing now effectively. */ + leave_mutex(m, acquired); + + if (!h2_ihash_empty(m->tasks)) { + /* when we are here, we lost track of the tasks still present. + * this currently happens with mod_proxy_http2 when we shut + * down a h2_req_engine with tasks assigned... */ + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(03056) "h2_mplx(%ld): 3. release_join with %d tasks", m->id, (int)h2_ihash_count(m->tasks)); h2_ihash_iter(m->tasks, task_print, m); + + while (!h2_ihash_iter(m->tasks, task_done_iter, m)) { + /* iterate until all tasks have been removed */ + } } - AP_DEBUG_ASSERT(h2_ihash_empty(m->shold)); - if (!h2_ihash_empty(m->spurge)) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, - "h2_mplx(%ld): 3. release_join %d streams to purge", - m->id, (int)h2_ihash_count(m->spurge)); - purge_streams(m); - } + + /* 7. With all tasks done, the stream hold should be empty and all + * remaining streams are ready for purging */ + ap_assert(h2_ihash_empty(m->shold)); + purge_streams(m); - if (!h2_ihash_empty(m->tasks)) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, m->c, APLOGNO(03056) - "h2_mplx(%ld): release_join -> destroy, " - "%d tasks still present", - m->id, (int)h2_ihash_count(m->tasks)); - } - leave_mutex(m, acquired); + /* 8. close the h2_req_enginge shed and self destruct */ + h2_ngn_shed_destroy(m->ngn_shed); + m->ngn_shed = NULL; h2_mplx_destroy(m); - /* all gone */ } return status; } @@ -677,7 +645,6 @@ void h2_mplx_abort(h2_mplx *m) { int acquired; - AP_DEBUG_ASSERT(m); if (!m->aborted && enter_mutex(m, &acquired) == APR_SUCCESS) { m->aborted = 1; h2_ngn_shed_abort(m->ngn_shed); @@ -690,7 +657,6 @@ apr_status_t h2_mplx_stream_done(h2_mplx apr_status_t status = APR_SUCCESS; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, "h2_mplx(%ld-%d): marking stream as done.", @@ -707,7 +673,6 @@ h2_stream *h2_mplx_stream_get(h2_mplx *m h2_stream *s = NULL; int acquired; - AP_DEBUG_ASSERT(m); if ((enter_mutex(m, &acquired)) == APR_SUCCESS) { s = h2_ihash_get(m->streams, id); leave_mutex(m, acquired); @@ -728,7 +693,6 @@ static void output_produced(void *ctx, h h2_stream *stream; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { stream = h2_ihash_get(m->streams, beam->id); if (stream) { @@ -780,7 +744,6 @@ apr_status_t h2_mplx_out_open(h2_mplx *m apr_status_t status; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { if (m->aborted) { status = APR_ECONNABORTED; @@ -825,7 +788,6 @@ apr_status_t h2_mplx_out_trywait(h2_mplx apr_status_t status; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { if (m->aborted) { status = APR_ECONNABORTED; @@ -866,7 +828,6 @@ apr_status_t h2_mplx_reprioritize(h2_mpl apr_status_t status; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { if (m->aborted) { status = APR_ECONNABORTED; @@ -888,7 +849,6 @@ apr_status_t h2_mplx_process(h2_mplx *m, int do_registration = 0; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { if (m->aborted) { status = APR_ECONNABORTED; @@ -981,7 +941,6 @@ h2_task *h2_mplx_pop_task(h2_mplx *m, in apr_status_t status; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { if (m->aborted) { *has_more = 0; @@ -1088,8 +1047,8 @@ static void task_done(h2_mplx *m, h2_tas stream = h2_ihash_get(m->shold, task->stream_id); if (stream) { ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, - "h2_mplx(%s): task_done, stream in hold", - task->id); + "h2_mplx(%s): task_done, stream %d in hold", + task->id, stream->id); /* We cannot destroy the stream here since this is * called from a worker thread and freeing memory pools * is only safe in the only thread using it (and its @@ -1103,14 +1062,16 @@ static void task_done(h2_mplx *m, h2_tas task->id); task_destroy(m, task, 0); } - - if (m->join_wait) { - apr_thread_cond_signal(m->join_wait); - } } } } +static int task_done_iter(void *ctx, void *val) +{ + task_done((h2_mplx*)ctx, val, 0); + return 0; +} + void h2_mplx_task_done(h2_mplx *m, h2_task *task, h2_task **ptask) { int acquired; @@ -1118,6 +1079,9 @@ void h2_mplx_task_done(h2_mplx *m, h2_ta if (enter_mutex(m, &acquired) == APR_SUCCESS) { task_done(m, task, NULL); --m->workers_busy; + if (m->join_wait) { + apr_thread_cond_signal(m->join_wait); + } if (ptask) { /* caller wants another task */ *ptask = next_stream_task(m); @@ -1411,7 +1375,6 @@ apr_status_t h2_mplx_dispatch_master_eve h2_stream *stream; size_t i, n; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, m->c, "h2_mplx(%ld): dispatch events", m->id); @@ -1442,7 +1405,6 @@ apr_status_t h2_mplx_keep_active(h2_mplx apr_status_t status; int acquired; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { h2_stream *s = h2_ihash_get(m->streams, stream_id); if (s) { @@ -1458,7 +1420,6 @@ int h2_mplx_awaits_data(h2_mplx *m) apr_status_t status; int acquired, waiting = 1; - AP_DEBUG_ASSERT(m); if ((status = enter_mutex(m, &acquired)) == APR_SUCCESS) { if (h2_ihash_empty(m->streams)) { waiting = 0; Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.c Thu Oct 27 16:53:58 2016 @@ -215,7 +215,7 @@ apr_status_t h2_ngn_shed_push_request(h2 "h2_ngn_shed(%ld): create engine %s (%s)", shed->c->id, newngn->id, newngn->type); if (status == APR_SUCCESS) { - AP_DEBUG_ASSERT(task->engine == NULL); + ap_assert(task->engine == NULL); newngn->task = task; task->engine = newngn; task->assigned = newngn; @@ -252,7 +252,7 @@ apr_status_t h2_ngn_shed_pull_request(h2 { h2_ngn_entry *entry; - AP_DEBUG_ASSERT(ngn); + ap_assert(ngn); *pr = NULL; ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, shed->c, APLOGNO(03396) "h2_ngn_shed(%ld): pull task for engine %s, shutdown=%d", @@ -352,6 +352,7 @@ void h2_ngn_shed_done_ngn(h2_ngn_shed *s "frozen=%d, aborting", shed->c->id, ngn->id, task->id, task->frozen); ngn_done_task(shed, ngn, task, 0, 1); + task->engine = task->assigned = NULL; } } if (!shed->aborted && (ngn->no_assigned > 1 || ngn->no_live > 1)) { @@ -371,3 +372,9 @@ void h2_ngn_shed_done_ngn(h2_ngn_shed *s apr_hash_set(shed->ngns, ngn->type, APR_HASH_KEY_STRING, NULL); ngn->done = 1; } + +void h2_ngn_shed_destroy(h2_ngn_shed *shed) +{ + ap_assert(apr_hash_count(shed->ngns) == 0); +} + Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.h?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.h (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_ngn_shed.h Thu Oct 27 16:53:58 2016 @@ -51,6 +51,8 @@ h2_ngn_shed *h2_ngn_shed_create(apr_pool int default_capactiy, apr_size_t req_buffer_size); +void h2_ngn_shed_destroy(h2_ngn_shed *shed); + void h2_ngn_shed_set_ctx(h2_ngn_shed *shed, void *user_ctx); void *h2_ngn_shed_get_ctx(h2_ngn_shed *shed); Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_session.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_session.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_session.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_session.c Thu Oct 27 16:53:58 2016 @@ -926,7 +926,7 @@ static apr_status_t session_shutdown(h2_ apr_status_t status = APR_SUCCESS; const char *err = msg; - AP_DEBUG_ASSERT(session); + ap_assert(session); if (!err && reason) { err = nghttp2_strerror(reason); } Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_util.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_util.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_proxy_util.c Thu Oct 27 16:53:58 2016 @@ -425,11 +425,11 @@ h2_proxy_ngheader *h2_proxy_util_nghd_ma h2_proxy_ngheader *ngh; size_t n; - AP_DEBUG_ASSERT(req); - AP_DEBUG_ASSERT(req->scheme); - AP_DEBUG_ASSERT(req->authority); - AP_DEBUG_ASSERT(req->path); - AP_DEBUG_ASSERT(req->method); + ap_assert(req); + ap_assert(req->scheme); + ap_assert(req->authority); + ap_assert(req->path); + ap_assert(req->method); n = 4; apr_table_do(count_header, &n, req->headers, NULL); @@ -608,10 +608,10 @@ apr_status_t h2_proxy_req_make(h2_proxy_ req->authority = authority; req->path = path; - AP_DEBUG_ASSERT(req->scheme); - AP_DEBUG_ASSERT(req->authority); - AP_DEBUG_ASSERT(req->path); - AP_DEBUG_ASSERT(req->method); + ap_assert(req->scheme); + ap_assert(req->authority); + ap_assert(req->path); + ap_assert(req->method); x.pool = pool; x.headers = req->headers; Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_session.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_session.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_session.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_session.c Thu Oct 27 16:53:58 2016 @@ -711,7 +711,7 @@ static apr_status_t init_callbacks(conn_ static void h2_session_destroy(h2_session *session) { - AP_DEBUG_ASSERT(session); + ap_assert(session); h2_ihash_clear(session->streams); if (session->mplx) { @@ -743,7 +743,7 @@ static apr_status_t h2_session_shutdown_ { apr_status_t status; - AP_DEBUG_ASSERT(session); + ap_assert(session); if (!session->local.accepting) { return APR_SUCCESS; } @@ -764,7 +764,7 @@ static apr_status_t h2_session_shutdown( { apr_status_t status = APR_SUCCESS; - AP_DEBUG_ASSERT(session); + ap_assert(session); if (session->local.shutdown) { return APR_SUCCESS; } @@ -1034,7 +1034,7 @@ static apr_status_t h2_session_start(h2_ size_t slen; int win_size; - AP_DEBUG_ASSERT(session); + ap_assert(session); /* Start the conversation by submitting our SETTINGS frame */ *rv = 0; if (session->r) { @@ -1154,7 +1154,7 @@ static ssize_t stream_data_cb(nghttp2_se int eos = 0; apr_status_t status; h2_stream *stream; - AP_DEBUG_ASSERT(session); + ap_assert(session); /* The session wants to send more DATA for the stream. We need * to find out how much of the requested length we can send without Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_stream.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_stream.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_stream.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_stream.c Thu Oct 27 16:53:58 2016 @@ -173,6 +173,7 @@ static apr_status_t stream_pool_cleanup( h2_stream *stream = ctx; apr_status_t status; + ap_assert(stream->can_be_cleaned); if (stream->files) { apr_file_t *file; int i; @@ -213,31 +214,35 @@ h2_stream *h2_stream_open(int id, apr_po void h2_stream_cleanup(h2_stream *stream) { - AP_DEBUG_ASSERT(stream); + apr_status_t status; + + ap_assert(stream); if (stream->out_buffer) { + /* remove any left over output buckets that may still have + * references into request pools */ apr_brigade_cleanup(stream->out_buffer); } - if (stream->input) { - apr_status_t status; - status = h2_beam_shutdown(stream->input, APR_NONBLOCK_READ, 1); - if (status == APR_EAGAIN) { - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, stream->session->c, - "h2_stream(%ld-%d): wait on input shutdown", - stream->session->id, stream->id); - status = h2_beam_shutdown(stream->input, APR_BLOCK_READ, 1); - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, stream->session->c, - "h2_stream(%ld-%d): input shutdown returned", - stream->session->id, stream->id); - } + h2_beam_abort(stream->input); + status = h2_beam_wait_empty(stream->input, APR_NONBLOCK_READ); + if (status == APR_EAGAIN) { + ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, stream->session->c, + "h2_stream(%ld-%d): wait on input drain", + stream->session->id, stream->id); + status = h2_beam_wait_empty(stream->input, APR_BLOCK_READ); + ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, stream->session->c, + "h2_stream(%ld-%d): input drain returned", + stream->session->id, stream->id); } } void h2_stream_destroy(h2_stream *stream) { - AP_DEBUG_ASSERT(stream); + ap_assert(stream); + ap_assert(!h2_mplx_stream_get(stream->session->mplx, stream->id)); ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, stream->session->c, "h2_stream(%ld-%d): destroy", stream->session->id, stream->id); + stream->can_be_cleaned = 1; if (stream->pool) { apr_pool_destroy(stream->pool); } @@ -327,7 +332,7 @@ apr_status_t h2_stream_add_header(h2_str const char *name, size_t nlen, const char *value, size_t vlen) { - AP_DEBUG_ASSERT(stream); + ap_assert(stream); if (!stream->has_response) { if (name[0] == ':') { @@ -383,9 +388,9 @@ apr_status_t h2_stream_schedule(h2_strea h2_stream_pri_cmp *cmp, void *ctx) { apr_status_t status = APR_EINVAL; - AP_DEBUG_ASSERT(stream); - AP_DEBUG_ASSERT(stream->session); - AP_DEBUG_ASSERT(stream->session->mplx); + ap_assert(stream); + ap_assert(stream->session); + ap_assert(stream->session->mplx); if (!stream->scheduled) { if (eos) { @@ -444,7 +449,9 @@ int h2_stream_is_scheduled(const h2_stre apr_status_t h2_stream_close_input(h2_stream *stream) { conn_rec *c = stream->session->c; - apr_status_t status = APR_SUCCESS, rv; + apr_status_t status; + apr_bucket_brigade *tmp; + apr_bucket *b; ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, stream->session->c, "h2_stream(%ld-%d): closing input", @@ -453,27 +460,20 @@ apr_status_t h2_stream_close_input(h2_st return APR_ECONNRESET; } - if (!stream->input) { - h2_beam_create(&stream->input, stream->pool, stream->id, "input", 0); - } - + tmp = apr_brigade_create(stream->pool, c->bucket_alloc); if (stream->trailers && !apr_is_empty_table(stream->trailers)) { h2_headers *r = h2_headers_create(HTTP_OK, stream->trailers, NULL, stream->pool); - apr_bucket *b = h2_bucket_headers_create(c->bucket_alloc, r); - apr_bucket_brigade *tmp; - - tmp = apr_brigade_create(stream->pool, c->bucket_alloc); + b = h2_bucket_headers_create(c->bucket_alloc, r); APR_BRIGADE_INSERT_TAIL(tmp, b); - status = h2_beam_send(stream->input, tmp, APR_BLOCK_READ); - apr_brigade_destroy(tmp); - stream->trailers = NULL; } - close_input(stream); - rv = h2_beam_close(stream->input); - return status ? status : rv; + b = apr_bucket_eos_create(c->bucket_alloc); + APR_BRIGADE_INSERT_TAIL(tmp, b); + status = h2_beam_send(stream->input, tmp, APR_BLOCK_READ); + apr_brigade_destroy(tmp); + return status; } apr_status_t h2_stream_write_data(h2_stream *stream, @@ -483,7 +483,7 @@ apr_status_t h2_stream_write_data(h2_str apr_status_t status = APR_SUCCESS; apr_bucket_brigade *tmp; - AP_DEBUG_ASSERT(stream); + ap_assert(stream); if (!stream->input) { return APR_EOF; } Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h Thu Oct 27 16:53:58 2016 @@ -65,6 +65,7 @@ struct h2_stream { unsigned int started : 1; /* stream has started processing */ unsigned int has_response : 1; /* response headers are known */ unsigned int push_policy; /* which push policy to use for this request */ + unsigned int can_be_cleaned : 1; /* stream pool can be cleaned */ apr_off_t out_data_frames; /* # of DATA frames sent */ apr_off_t out_data_octets; /* # of DATA octets (payload) sent */ @@ -98,7 +99,7 @@ void h2_stream_eos_destroy(h2_stream *st void h2_stream_destroy(h2_stream *stream); /** - * Removes stream from h2_session and destroys it. + * Cleanup references into requst processing. * * @param stream the stream to cleanup */ Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_task.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_task.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_task.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_task.c Thu Oct 27 16:53:58 2016 @@ -546,7 +546,7 @@ void h2_task_destroy(h2_task *task) apr_status_t h2_task_do(h2_task *task, apr_thread_t *thread, int worker_id) { - AP_DEBUG_ASSERT(task); + ap_assert(task); if (task->c->master) { /* Each conn_rec->id is supposed to be unique at a point in time. Since @@ -580,7 +580,6 @@ apr_status_t h2_task_do(h2_task *task, a task->c->id = (task->c->master->id << free_bits)^slave_id; } - task->input.chunked = task->request->chunked; task->input.bb = apr_brigade_create(task->pool, task->c->bucket_alloc); if (task->request->serialize) { ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, task->c, Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_task.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_task.h?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_task.h (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_task.h Thu Oct 27 16:53:58 2016 @@ -60,7 +60,6 @@ struct h2_task { struct { struct h2_bucket_beam *beam; - unsigned int chunked : 1; unsigned int eos : 1; apr_bucket_brigade *bb; apr_bucket_brigade *bbchunk; Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_util.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_util.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_util.c Thu Oct 27 16:53:58 2016 @@ -1130,11 +1130,11 @@ h2_ngheader *h2_util_ngheader_make_req(a h2_ngheader *ngh; size_t n; - AP_DEBUG_ASSERT(req); - AP_DEBUG_ASSERT(req->scheme); - AP_DEBUG_ASSERT(req->authority); - AP_DEBUG_ASSERT(req->path); - AP_DEBUG_ASSERT(req->method); + ap_assert(req); + ap_assert(req->scheme); + ap_assert(req->authority); + ap_assert(req->path); + ap_assert(req->method); n = 4; apr_table_do(count_header, &n, req->headers, NULL); Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_version.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_version.h?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_version.h (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_version.h Thu Oct 27 16:53:58 2016 @@ -26,7 +26,7 @@ * @macro * Version number of the http2 module as c string */ -#define MOD_HTTP2_VERSION "1.7.6" +#define MOD_HTTP2_VERSION "1.7.7" /** * @macro @@ -34,7 +34,7 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define MOD_HTTP2_VERSION_NUM 0x010706 +#define MOD_HTTP2_VERSION_NUM 0x010707 #endif /* mod_h2_h2_version_h */ Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_workers.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_workers.c?rev=1766856&r1=1766855&r2=1766856&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_workers.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_workers.c Thu Oct 27 16:53:58 2016 @@ -243,8 +243,8 @@ h2_workers *h2_workers_create(server_rec h2_workers *workers; apr_pool_t *pool; - AP_DEBUG_ASSERT(s); - AP_DEBUG_ASSERT(server_pool); + ap_assert(s); + ap_assert(server_pool); /* let's have our own pool that will be parent to all h2_worker * instances we create. This happens in various threads, but always