You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/02/14 15:20:58 UTC
svn commit: r1824246 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
docs/manual/mod/mod_remoteip.xml modules/metadata/mod_remoteip.c
Author: ylavic
Date: Wed Feb 14 15:20:58 2018
New Revision: 1824246
URL: http://svn.apache.org/viewvc?rev=1824246&view=rev
Log:
Revert r1824221: wrong backport.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml
httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 14 15:20:58 2018
@@ -6,4 +6,4 @@
/httpd/httpd/branches/trunk-md:1804087-1804529
/httpd/httpd/branches/trunk-override-index:1793921-1793931
/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,1501827,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,1551611,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,1556473,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,15805
68,1583005,1583007-1583008,1583027,1583175,1583191,1584098,1584417,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585157,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,1597533,1597639,1597642,1598107,1598946,1599012,1599535,1601076,1601184-1601185,1601274,1601291,1601559,1601624,1601630,1601919,1601995,1602338,1602978,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605328,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,16
11165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1618401,1618541,1618555,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,1629576-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,1643279,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649491,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,1662437,1663017,1663647,1664071,1664133,1664205,1664299,1664565,1664709,1665215-1665216,1665218,1665625,1665643,1665721,1666297,1666361,1666363,1666468,1666617-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,1683
881,1683884,1684057,1684171,1684636,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688399,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,1698334,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,1702948,1703152,1703241,1703417,1703642,1703807,1703813,1
703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1705922,1705983,1706275,1706523,1706595,1706627,1706635,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707512,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,1713043,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,1718476,1718496,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899,1722137,1722154,1722177,1722195,1722229,172232
0,1722328,1722334,1722350-1722351,1722358,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723522,1723567,1723953,1724847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,1725325,1725328,1725387,1725392,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,1726675,1726705,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1728326,1728804,1729208,1729235,1729374,1729376,1729826,1729847,1729929-1729931,1729960,1730079,1730297,1730640,1730723,1730865,1731929,1732228,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733537-1733538,1733691,1734006,1734125,1734239,1734294,1734412,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-1735609,1735611,1735668,1735786,1735906,1735931,173
5935,1735942,1735952,1736156,1736186,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1738217,1738331,1738333,1738464,1738466,1738486,1738563,1738628,1738631,1738633,1738635,1739008,1739146,1739151,1739193,1739201,1739303,1739312,1739738,1739932,1740075,1740084,1740108,1740110,1740155,1740735,1740910,1740928,1740960,1740967,1740987,1740998,1741045,1741065,1741112,1741115,1741268,1741277,1741310,1741392,1741414,1741446,1741461,1741557,1741564,1741570,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-1742447,1742460,1742697,1742791-1742792,1743335,1743517,1743699,1743788,1743816,1744203-1744204,1744206,1744283,1744415,1744421,1744458-1744459,1744712,1744751,1744767,1744778,1744980,1745034,1745039,1745175,1745767,1745835,1745863-1745864,1746207,1746647,1746988,1747170,1747469,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,1752331-1752333,1752347,1752415,1753167,1753224,1753228-1753229,1753257,1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754164,1754391,1754399,1754414,1754534,1755323,1756038,1756542,1756553,1756611,1756631,1756844,1756846,1756848,1756852-1756853,1756976,1757009-1757011,1757029-1757031,1757061,1757524,1757534,1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759415,1759984,1760018,1761434,1761477,1761479,1761548,1761714,1761824,1762512,1762515,1762517,1762580,1762701-1762703,1762718,1762723,1762742-1762743,1763158,1763246,1763613,1764005,1764040,1764046,1764236,1764243,1764255,1765318,1765328,1765357,1765420,1766097,1766129,1766160,17663
08,1766424,1766691,1766851,1766857,1766998,1767128,1767180-1767181,1767553,1767564,1767803,1767936,1768160,1768245,1769192,1769332,1769550,1769593,1769596,1769600,1770395,1770750,1770752,1770768,1770771,1770828,1770951,1770998,1771001,1771015,1771789,1771791,1771827,1772339,1772489,1772504,1772576,1772812-1772813,1772919,1773159,1773162,1773293,1773346,1773397,1773761,1773779,1773812,1773861-1773862,1773865,1774008,1774018,1774023,1774068-1774069,1774286,1774288,1774538,1774541,1774602,1774609,1775173,1775195,1775199,1775487,1775664,1775770,1775775,1775813,1775833,1775858,1775944,1775946,1776459,1776463,1776575,1776578,1776627,1776674,1776734-1776735,1776738,1776956,1777160,1777324,1777354,1777460,1777556-1777557,1777593-1777594,1777672,1777923,1778319,1778331,1778350,1778630,1779077,1779091,1779111,1779354,1779459,1779525,1779528,1779573-1779574,1779623,1779699,1779738,1779743,1779896,1779972,1779979,1780095,1780159,1780328-1780329,1780576,1780596,1780598,1780971,1781187,1781190,17
81304,1781312-1781313,1781324,1781328-1781329,1781575,1781577,1781580,1781687,1782164,1782166,1782193-1782194,1782323,1782418-1782419,1782482,1782532,1782875,1782944,1782958,1782975,1783056,1783305,1783722-1783723,1783764-1783765,1783770,1783842,1783849,1784002,1784203,1784205,1784227-1784228,1784275,1784318,1784366,1784372,1784571,1785115,1785672,1785683,1785752-1785753,1785871,1785907,1786009,1786512,1786575-1786576,1786715,1787051,1787053,1787141,1787525,1787553,1787604,1788032-1788033,1788040,1788430,1788451,1788508,1788672,1788981,1788996,1788998,1789000,1789220-1789221,1789224,1789276,1789279,1789387,1789395,1789520,1789535,1789692,1789740,1790102,1790113,1790284,1790754,1790826-1790827,1790842,1790850,1790852-1790853,1790855,1790860,1790973,1790978,1791377,1791388,1791400,1791669,1791773,1791790,1791975,1792092,1792195,1792212,1792589,1792675,1793525,1793533,1793932,1794049,1795635,1795651,1795830,1795931,1796343,1796348,1796350,1796446,1796493,1796864,1797550,1797745,1798785
,1799341,1799435,1799437,1799784,1799786,1800173,1800306,1800393,1800594,1800689,1800788,1800809,1800815,1800817,1800819,1800830,1800833,1800917,1800919,1800978,1801594,1801665,1801994-1801995,1802305,1802309,1802336,1802535,1802618,1802845,1802875,1803392,1803396,1803398,1803420,1803454,1804090,1804096,1804530-1804531,1804542,1804545,1804671,1804759,1804787,1804975,1805099,1805180,1805188,1805190,1805192,1805194-1805195,1805206,1805256,1805294,1805322,1805373,1806939,1807228,1807238,1807347,1807577,1807593,1807655,1807774,1807777,1808005,1808008,1808085,1808092,1808100,1808230,1808241-1808243,1808249,1808444,1808671,1808723,1808746,1808780,1809028,1809209,1809273,1809302-1809303,1809305,1809311,1809314,1809713,1809719,1809881,1809888,1809973,1809976,1809981,1810088-1810089,1810358,1810362-1810363,1810365,1810447,1810723,1811082,1811192,1811285,1811540-1811541,1811569-1811570,1811649,1811664,1811744,1811812,1812004,1812075,1812193,1812263,1812301,1812307,1812517-1812518,1812999,1813
642-1813643,1813991,1814118,1814719-1814720,1814939,1814968,1815005,1815078,1815264,1815370,1815483,1816055,1816154,1816156,1816534,1816552,1816558,1816619,1816919,1816922,1816970,1817023,1817777,1817785,1818013,1818040,1818120,1818122,1818278-1818280,1818308,1818624,1818725,1818792,1818804,1818849,1818951,1818958,1818960,1819027,1819214,1819847-1819848,1819852-1819853,1819855,1819969-1819970,1820035,1820101,1820808-1820809,1821095,1821371,1821374,1821504-1821505,1821558,1821561-1821562,1821595,1822305,1822502-1822503,1822509,1822511,1822624,1823179,1823412,1823415-1823416,1823564,1823572,1823575
+/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,1501827,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,1551611,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,1556473,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,15805
68,1583005,1583007-1583008,1583027,1583175,1583191,1584098,1584417,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585157,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,1597533,1597639,1597642,1598107,1598946,1599012,1599535,1601076,1601184-1601185,1601274,1601291,1601559,1601624,1601630,1601919,1601995,1602338,1602978,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605328,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,16
11165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1618401,1618541,1618555,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,1629576-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,1643279,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649491,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,1662437,1663017,1663647,1664071,1664133,1664205,1664299,1664565,1664709,1665215-1665216,1665218,1665625,1665643,1665721,1666297,1666361,1666363,1666468,1666617-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,1683
881,1683884,1684057,1684171,1684636,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688399,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,1698334,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,1702948,1703152,1703241,1703417,1703642,1703807,1703813,1
703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1705922,1705983,1706275,1706523,1706595,1706627,1706635,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707512,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,1713043,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,1718476,1718496,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899,1722137,1722154,1722177,1722195,1722229,172232
0,1722328,1722334,1722350-1722351,1722358,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723522,1723567,1723953,1724847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,1725325,1725328,1725387,1725392,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,1726675,1726705,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1728326,1728804,1729208,1729235,1729374,1729376,1729826,1729847,1729929-1729931,1729960,1730079,1730297,1730640,1730723,1730865,1731929,1732228,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733537-1733538,1733691,1734006,1734125,1734239,1734294,1734412,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-1735609,1735611,1735668,1735786,1735906,1735931,173
5935,1735942,1735952,1736156,1736186,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1738217,1738331,1738333,1738464,1738466,1738486,1738563,1738628,1738631,1738633,1738635,1739008,1739146,1739151,1739193,1739201,1739303,1739312,1739738,1739932,1740075,1740084,1740108,1740110,1740155,1740735,1740910,1740928,1740960,1740967,1740987,1740998,1741045,1741065,1741112,1741115,1741268,1741277,1741310,1741392,1741414,1741446,1741461,1741557,1741564,1741570,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-1742447,1742460,1742697,1742791-1742792,1743335,1743517,1743699,1743788,1743816,1744203-1744204,1744206,1744283,1744415,1744421,1744458-1744459,1744712,1744751,1744767,1744778,1744980,1745034,1745039,1745175,1745767,1745835,1745863-1745864,1746207,1746647,1746988,1747170,1747469,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,1752331-1752333,1752347,1752415,1753167,1753224,1753228-1753229,1753257,1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754164,1754391,1754399,1754414,1754534,1755323,1756038,1756542,1756553,1756611,1756631,1756844,1756846,1756848,1756852-1756853,1756976,1757009-1757011,1757029-1757031,1757061,1757524,1757534,1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759415,1759984,1760018,1761434,1761477,1761479,1761548,1761714,1761824,1762512,1762515,1762517,1762580,1762701-1762703,1762718,1762723,1762742-1762743,1763158,1763246,1763613,1764005,1764040,1764046,1764236,1764243,1764255,1765318,1765328,1765357,1765420,1766097,1766129,1766160,17663
08,1766424,1766691,1766851,1766857,1766998,1767128,1767180-1767181,1767553,1767564,1767803,1767936,1768160,1768245,1769192,1769332,1769550,1769593,1769596,1769600,1770395,1770750,1770752,1770768,1770771,1770828,1770951,1770998,1771001,1771015,1771789,1771791,1771827,1772339,1772489,1772504,1772576,1772812-1772813,1772919,1773159,1773162,1773293,1773346,1773397,1773761,1773779,1773812,1773861-1773862,1773865,1774008,1774018,1774023,1774068-1774069,1774286,1774288,1774538,1774541,1774602,1774609,1775173,1775195,1775199,1775487,1775664,1775770,1775775,1775813,1775833,1775858,1775944,1775946,1776459,1776463,1776735,1776738,1776956,1777160,1777324,1777354,1777460,1777556-1777557,1777593-1777594,1777672,1777923,1778319,1778331,1778350,1778630,1779077,1779091,1779111,1779354,1779459,1779525,1779528,1779573-1779574,1779623,1779699,1779738,1779743,1779896,1779972,1779979,1780095,1780159,1780328-1780329,1780576,1780596,1780598,1780971,1781187,1781190,1781304,1781312-1781313,1781324,1781328-17
81329,1781575,1781577,1781580,1781687,1782164,1782166,1782193-1782194,1782323,1782418-1782419,1782482,1782532,1782875,1782944,1782958,1782975,1783056,1783305,1783722-1783723,1783764-1783765,1783770,1783842,1783849,1784002,1784203,1784205,1784227-1784228,1784275,1784318,1784366,1784372,1784571,1785115,1785672,1785683,1785752-1785753,1785871,1785907,1786009,1786512,1786575-1786576,1786715,1787051,1787053,1787141,1787525,1787553,1787604,1788032-1788033,1788040,1788430,1788451,1788508,1788672,1788981,1788996,1788998,1789000,1789220-1789221,1789224,1789276,1789279,1789387,1789395,1789520,1789535,1789692,1789740,1790102,1790113,1790284,1790754,1790826-1790827,1790842,1790850,1790852-1790853,1790855,1790860,1790973,1790978,1791377,1791388,1791400,1791669,1791773,1791790,1791975,1792092,1792195,1792212,1792589,1792675,1793525,1793533,1793932,1794049,1795635,1795651,1795830,1795931,1796343,1796348,1796350,1796446,1796493,1796864,1797550,1797745,1798785,1799341,1799435,1799437,1799784,1799786
,1800173,1800306,1800393,1800594,1800689,1800788,1800809,1800815,1800817,1800819,1800830,1800833,1800917,1800919,1800978,1801594,1801665,1801994-1801995,1802305,1802309,1802336,1802535,1802618,1802845,1802875,1803392,1803396,1803398,1803420,1803454,1804090,1804096,1804530-1804531,1804542,1804545,1804671,1804759,1804787,1804975,1805099,1805180,1805188,1805190,1805192,1805194-1805195,1805206,1805256,1805294,1805322,1805373,1806939,1807228,1807238,1807347,1807577,1807593,1807655,1807774,1807777,1808005,1808008,1808085,1808092,1808100,1808230,1808241-1808243,1808249,1808444,1808671,1808723,1808746,1808780,1809028,1809209,1809273,1809302-1809303,1809305,1809311,1809314,1809713,1809719,1809881,1809888,1809973,1809976,1809981,1810088-1810089,1810358,1810362-1810363,1810365,1810447,1810723,1811082,1811192,1811285,1811540-1811541,1811569-1811570,1811649,1811664,1811744,1811812,1812004,1812075,1812193,1812263,1812301,1812307,1812517-1812518,1812999,1813642-1813643,1813991,1814118,1814719-1814
720,1814939,1814968,1815005,1815078,1815264,1815370,1815483,1816055,1816154,1816156,1816534,1816552,1816558,1816619,1816919,1816922,1816970,1817023,1817777,1817785,1818013,1818040,1818120,1818122,1818278,1818280,1818308,1818624,1818725,1818792,1818804,1818849,1818951,1818958,1818960,1819027,1819214,1819847-1819848,1819852-1819853,1819855,1819969-1819970,1820035,1820101,1820808-1820809,1821095,1821371,1821374,1821504-1821505,1821558,1821561-1821562,1821595,1822305,1822502-1822503,1822509,1822511,1822624,1823179,1823412,1823415-1823416,1823564,1823572,1823575
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1824246&r1=1824245&r2=1824246&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Feb 14 15:20:58 2018
@@ -1,11 +1,6 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.30
- *) mod_remoteip: Add support for PROXY protocol (code donated by Cloudzilla).
- Add ability for PROXY protocol processing to be optional to donated code.
- See also: http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
- [Cloudzilla/roadrunner2@GitHub, Jim Jagielski, Daniel Ruggeri]
-
*) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
allowing per backend TLS configuration. [Yann Ylavic]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1824246&r1=1824245&r2=1824246&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Feb 14 15:20:58 2018
@@ -118,6 +118,35 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
+ *) mod_remoteip: Add PROXY protocol support
+ trunk patch: http://svn.apache.org/r1776575
+ http://svn.apache.org/r1776578 (doc fix)
+ http://svn.apache.org/r1776624
+ http://svn.apache.org/r1776627 (shortened name + doc fix)
+ http://svn.apache.org/r1776674 (attribution moved to CHANGES)
+ http://svn.apache.org/r1776734
+ http://svn.apache.org/r1776740 (attribution updated in mod_remotip.c)
+ http://svn.apache.org/r1778268 (fix compiler warning)
+ http://svn.apache.org/r1780725 (set buckets aside)
+ http://svn.apache.org/r1781030 (fix strict GCC warning)
+ http://svn.apache.org/r1781031 (reference the filter by handle)
+ http://svn.apache.org/r1781701 (rework optional processing case)
+ http://svn.apache.org/r1788674 (final edge cases/ignore slave conns)
+ http://svn.apache.org/r1789800 (remove optional processing)
+ http://svn.apache.org/r1790169 (rename "exception" directive)
+ http://svn.apache.org/r1790457 (Update directive name in err message)
+ http://svn.apache.org/r1790691
+ http://svn.apache.org/r1806985
+ http://svn.apache.org/r1818279
+ 2.4 convenience patch (includes CHANGES):
+ http://home.apache.org/~ylavic/patches/RemoteIPProxyProtocol.2.4-v3.patch
+ +1: druggeri, jim, minfrin
+ ylavic: RemoteIPProxyProtocol* are documented as scoped to server config
+ and virtual host, though using ap_server_conf makes them global
+ only (thus less useful too...).
+ jim: Can docco patch be post-backport?
+ minfrin: The docs seem correct, and there is a long explanation in the docs of
+ why the scoping is as it is.
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml?rev=1824246&r1=1824245&r2=1824246&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml Wed Feb 14 15:20:58 2018
@@ -42,12 +42,6 @@ via the request headers.
with the useragent IP address reported in the request header configured
with the <directive module="mod_remoteip">RemoteIPHeader</directive> directive.</p>
- <p>Additionally, this module implements the server side of
- HAProxy's
- <a href="http://blog.haproxy.com/haproxy/proxy-protocol/">Proxy Protocol</a> when
- using the <directive module="mod_remoteip">RemoteIPProxyProtocolEnable</directive>
- directive.</p>
-
<p>Once replaced as instructed, this overridden useragent IP address is
then used for the <module>mod_authz_host</module>
<directive module="mod_authz_core" name="require">Require ip</directive>
@@ -65,7 +59,6 @@ via the request headers.
<seealso><module>mod_authz_host</module></seealso>
<seealso><module>mod_status</module></seealso>
<seealso><module>mod_log_config</module></seealso>
-<seealso><a href="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">Proxy Protocol Spec</a></seealso>
<section id="processing"><title>Remote IP Processing</title>
@@ -218,70 +211,6 @@ RemoteIPProxiesHeader X-Forwarded-By
</usage>
</directivesynopsis>
-<directivesynopsis>
-<name>RemoteIPProxyProtocol</name>
-<description>Enable, optionally enable or disable the proxy protocol handling</description>
-<syntax>ProxyProtocol On|Optional|Off</syntax>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
-
-<usage>
- <p>The <directive>RemoteIPProxyProtocolEnable</directive> enables or
- disables the reading and handling of the proxy protocol connection header.
- If enabled with the <code>On</code> flag, the upstream client <em>must</em>
- send the header every time it opens a connection or the connection will
- be aborted. If enabled with the <code>Optional</code> flag, the upstream
- client <em>may</em> send the header.</p>
-
- <p>While this directive may be specified in any virtual host, it is
- important to understand that because the proxy protocol is connection
- based and protocol agnostic, the enabling and disabling is actually based
- on ip-address and port. This means that if you have multiple name-based
- virtual hosts for the same host and port, and you enable it any one of
- them, then it is enabled for all them (with that host and port). It also
- means that if you attempt to enable the proxy protocol in one and disable
- in the other, that won't work; in such a case the last one wins and a
- notice will be logged indicating which setting was being overridden.</p>
-
- <note type="hint">When multiple virtual hosts on the same IP and port are
- configured with a combination of <code>On</code> and <code>Optional</code>
- flags, connections will not be aborted if the header is not sent.
- Instead, enforcement will happen after the request is read so virtual
- hosts configured with <code>On</code> will return a 400 Bad Request.
- Virtual hosts configured with <code>Optional</code> will continue as
- usual but without replacing the client IP information</note>
-
- <highlight language="config">
-Listen 80
-<VirtualHost *:80>
- ServerName www.example.com
- RemoteIPProxyProtocolEnable Optional
-
- #Requests to this virtual host may optionally not have
- # a proxy protocol header provided
-</VirtualHost>
-
-<VirtualHost *:80>
- ServerName www.example.com
- RemoteIPProxyProtocolEnable On
-
- #Requests to this virtual host must have a proxy protocol
- # header provided. If it is missing, a 400 will result
-</VirtualHost>
-
-Listen 8080
-<VirtualHost *:8080>
- ServerName www.example.com
- RemoteIPProxyProtocolEnable On
-
- #Requests to this virtual host must have a proxy protocol
- # header provided. If it is missing, the connection will
- # be aborted
-</VirtualHost>
- </highlight>
-</usage>
-</directivesynopsis>
-
<directivesynopsis>
<name>RemoteIPTrustedProxy</name>
<description>Declare client intranet IP addresses trusted to present the RemoteIPHeader value</description>
Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c?rev=1824246&r1=1824245&r2=1824246&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c Wed Feb 14 15:20:58 2018
@@ -16,13 +16,11 @@
#include "ap_config.h"
#include "ap_mmn.h"
-#include "ap_listen.h"
#include "httpd.h"
#include "http_config.h"
#include "http_connection.h"
#include "http_protocol.h"
#include "http_log.h"
-#include "http_main.h"
#include "apr_strings.h"
#include "apr_lib.h"
#define APR_WANT_BYTEFUNC
@@ -38,12 +36,6 @@ typedef struct {
void *internal;
} remoteip_proxymatch_t;
-typedef struct remoteip_addr_info {
- struct remoteip_addr_info *next;
- apr_sockaddr_t *addr;
- server_rec *source;
-} remoteip_addr_info;
-
typedef struct {
/** The header to retrieve a proxy-via IP list */
const char *header_name;
@@ -56,17 +48,6 @@ typedef struct {
* with the most commonly encountered listed first
*/
apr_array_header_t *proxymatch_ip;
-
- remoteip_addr_info *proxy_protocol_enabled;
- remoteip_addr_info *proxy_protocol_optional;
- remoteip_addr_info *proxy_protocol_disabled;
-
- /** A flag indicating whether or not proxyprotocol
- * is optoinal for this specific server
- */
- int pp_optional;
-
- apr_pool_t *pool;
} remoteip_config_t;
typedef struct {
@@ -78,92 +59,12 @@ typedef struct {
const char *proxied_remote;
} remoteip_req_t;
-/* For PROXY protocol processing */
-static const char *remoteip_filter_name = "REMOTEIP_INPUT";
-
-typedef struct {
- char line[108];
-} proxy_v1;
-
-typedef union {
- struct { /* for TCP/UDP over IPv4, len = 12 */
- apr_uint32_t src_addr;
- apr_uint32_t dst_addr;
- apr_uint16_t src_port;
- apr_uint16_t dst_port;
- } ip4;
- struct { /* for TCP/UDP over IPv6, len = 36 */
- apr_byte_t src_addr[16];
- apr_byte_t dst_addr[16];
- apr_uint16_t src_port;
- apr_uint16_t dst_port;
- } ip6;
- struct { /* for AF_UNIX sockets, len = 216 */
- apr_byte_t src_addr[108];
- apr_byte_t dst_addr[108];
- } unx;
-} proxy_v2_addr;
-
-typedef struct {
- apr_byte_t sig[12]; /* hex 0D 0A 0D 0A 00 0D 0A 51 55 49 54 0A */
- apr_byte_t ver_cmd; /* protocol version and command */
- apr_byte_t fam; /* protocol family and address */
- apr_uint16_t len; /* number of following bytes part of the header */
- proxy_v2_addr addr;
-} proxy_v2;
-
-typedef union {
- proxy_v1 v1;
- proxy_v2 v2;
-} proxy_header;
-
-static const char v2sig[12] = "\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A";
-#define MIN_V1_HDR_LEN 15
-#define MIN_V2_HDR_LEN 16
-#define MIN_HDR_LEN MIN_V1_HDR_LEN
-
-/* XXX: Unsure if this is needed if v6 support is not available on
- this platform */
-#ifndef INET6_ADDRSTRLEN
-#define INET6_ADDRSTRLEN 46
-#endif
-
-typedef struct {
- char header[sizeof(proxy_header)];
- apr_size_t rcvd;
- apr_size_t need;
- int version;
- ap_input_mode_t mode;
- apr_bucket_brigade *bb;
- int done;
-} remoteip_filter_context;
-
-/** Holds the resolved proxy info for this connection and any addition
- configurable parameters
-*/
-typedef struct {
- /** The parsed client address in native format */
- apr_sockaddr_t *client_addr;
- /** Character representation of the client */
- char *client_ip;
- /** Flag indicating that the PROXY header may be omitted on this
- connection (do not abort if it is missing). */
- int proxy_protocol_optional;
-} remoteip_conn_config_t;
-
-typedef enum { HDR_DONE, HDR_ERROR, HDR_MISSING, HDR_NEED_MORE } remoteip_parse_status_t;
-
static void *create_remoteip_server_config(apr_pool_t *p, server_rec *s)
{
remoteip_config_t *config = apr_pcalloc(p, sizeof *config);
/* config->header_name = NULL;
* config->proxies_header_name = NULL;
*/
- config->proxy_protocol_enabled = NULL;
- config->proxy_protocol_optional = NULL;
- config->proxy_protocol_disabled = NULL;
- config->pp_optional = 0;
- config->pool = p;
return config;
}
@@ -184,9 +85,6 @@ static void *merge_remoteip_server_confi
config->proxymatch_ip = server->proxymatch_ip
? server->proxymatch_ip
: global->proxymatch_ip;
- config->pp_optional = server->pp_optional
- ? server->pp_optional
- : global->pp_optional;
return config;
}
@@ -317,184 +215,13 @@ static const char *proxylist_read(cmd_pa
return NULL;
}
-/** Similar apr_sockaddr_equal, except that it compares ports too. */
-static int remoteip_sockaddr_equal(apr_sockaddr_t *addr1, apr_sockaddr_t *addr2)
-{
- return (addr1->port == addr2->port && apr_sockaddr_equal(addr1, addr2));
-}
-
-/** Similar remoteip_sockaddr_equal, except that it handles wildcard addresses
- * and ports too.
- */
-static int remoteip_sockaddr_compat(apr_sockaddr_t *addr1, apr_sockaddr_t *addr2)
-{
- /* test exact address equality */
- if (apr_sockaddr_equal(addr1, addr2) &&
- (addr1->port == addr2->port || addr1->port == 0 || addr2->port == 0)) {
- return 1;
- }
-
- /* test address wildcards */
- if (apr_sockaddr_is_wildcard(addr1) &&
- (addr1->port == 0 || addr1->port == addr2->port)) {
- return 1;
- }
-
- if (apr_sockaddr_is_wildcard(addr2) &&
- (addr2->port == 0 || addr2->port == addr1->port)) {
- return 1;
- }
-
- return 0;
-}
-
-static int remoteip_addr_in_list(remoteip_addr_info *list, apr_sockaddr_t *addr)
-{
- for (; list; list = list->next) {
- if (remoteip_sockaddr_compat(list->addr, addr)) {
- return 1;
- }
- }
-
- return 0;
-}
-
-static void remoteip_warn_enable_conflict(remoteip_addr_info *prev, server_rec *new, const char* arg)
-{
- char buf[INET6_ADDRSTRLEN];
-
- apr_sockaddr_ip_getbuf(buf, sizeof(buf), prev->addr);
-
- ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, new, APLOGNO(03491)
- "RemoteIPProxyProtocolEnable: previous setting for %s:%hu from virtual "
- "host {%s:%hu in %s} is being overriden by virtual host "
- "{%s:%hu in %s}; new setting is '%s'",
- buf, prev->addr->port, prev->source->server_hostname,
- prev->source->addrs->host_port, prev->source->defn_name,
- new->server_hostname, new->addrs->host_port, new->defn_name,
- arg);
-}
-
-static const char *remoteip_enable_proxy_protocol(cmd_parms *cmd, void *config,
- const char *arg)
-{
- remoteip_config_t *global_conf;
- remoteip_config_t *server_conf;
- server_addr_rec *addr;
- remoteip_addr_info **add;
- int list_len = 2;
- remoteip_addr_info **rem_list[list_len];
- remoteip_addr_info *list;
- int i;
-
- global_conf = ap_get_module_config(ap_server_conf->module_config,
- &remoteip_module);
- server_conf = ap_get_module_config(cmd->server->module_config,
- &remoteip_module);
-
- if (strcasecmp(arg, "On") == 0) {
- add = &global_conf->proxy_protocol_enabled;
- rem_list[0] = &global_conf->proxy_protocol_optional;
- rem_list[1] = &global_conf->proxy_protocol_disabled;
- }
- else if (strcasecmp(arg, "Optional") == 0) {
- add = &global_conf->proxy_protocol_optional;
- rem_list[0] = &global_conf->proxy_protocol_enabled;
- rem_list[1] = &global_conf->proxy_protocol_disabled;
- server_conf->pp_optional = 1;
- }
- else if (strcasecmp(arg, "Off") == 0 ) {
- add = &global_conf->proxy_protocol_disabled;
- rem_list[0] = &global_conf->proxy_protocol_enabled;
- rem_list[1] = &global_conf->proxy_protocol_optional;
- }
- else {
- return apr_pstrcat(cmd->pool, "Unrecognized option for ProxyProtocolEnable `%s'", arg, NULL);
- }
-
- for (addr = cmd->server->addrs; addr; addr = addr->next) {
- /* remove address from other lists */
- for (i = 0; i < list_len ; i++) {
- remoteip_addr_info **rem = rem_list[i];
- if (*rem) {
- if (remoteip_sockaddr_equal((*rem)->addr, addr->host_addr)) {
- remoteip_warn_enable_conflict(*rem, cmd->server, arg);
- *rem = (*rem)->next;
- }
- else {
- for (list = *rem; list->next; list = list->next) {
- if (remoteip_sockaddr_equal(list->next->addr, addr->host_addr)) {
- remoteip_warn_enable_conflict(list->next, cmd->server, arg);
- list->next = list->next->next;
- break;
- }
- }
- }
- }
- }
-
- /* add address to desired list */
- if (!remoteip_addr_in_list(*add, addr->host_addr)) {
- remoteip_addr_info *info = apr_palloc(global_conf->pool, sizeof(*info));
- info->addr = addr->host_addr;
- info->source = cmd->server;
- info->next = *add;
- *add = info;
- }
- }
-
- return NULL;
-}
-
-static int remoteip_hook_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
- apr_pool_t *ptemp)
-{
- remoteip_config_t *config = (remoteip_config_t *)
- create_remoteip_server_config(pconf, NULL);
- ap_set_module_config(ap_server_conf->module_config, &remoteip_module,
- config);
-
- return OK;
-}
-
-static int remoteip_hook_post_config(apr_pool_t *pconf, apr_pool_t *plog,
- apr_pool_t *ptemp, server_rec *s)
-{
- remoteip_config_t *conf;
- remoteip_addr_info *info;
- char buf[INET6_ADDRSTRLEN];
-
- conf = ap_get_module_config(ap_server_conf->module_config,
- &remoteip_module);
-
- for (info = conf->proxy_protocol_enabled; info; info = info->next) {
- apr_sockaddr_ip_getbuf(buf, sizeof(buf), info->addr);
- ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(03492)
- "RemoteIPProxyProtocol: enabled on %s:%hu", buf, info->addr->port);
- }
- for (info = conf->proxy_protocol_optional; info; info = info->next) {
- apr_sockaddr_ip_getbuf(buf, sizeof(buf), info->addr);
- ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(03493)
- "RemoteIPProxyProtocol: optional on %s:%hu", buf, info->addr->port);
- }
- for (info = conf->proxy_protocol_disabled; info; info = info->next) {
- apr_sockaddr_ip_getbuf(buf, sizeof(buf), info->addr);
- ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(03494)
- "RemoteIPProxyProtocol: disabled on %s:%hu", buf, info->addr->port);
- }
-
- return OK;
-}
-
static int remoteip_modify_request(request_rec *r)
{
conn_rec *c = r->connection;
remoteip_config_t *config = (remoteip_config_t *)
ap_get_module_config(r->server->module_config, &remoteip_module);
- remoteip_conn_config_t *conn_config = (remoteip_conn_config_t *)
- ap_get_module_config(r->connection->conn_config, &remoteip_module);
-
remoteip_req_t *req = NULL;
+
apr_sockaddr_t *temp_sa;
apr_status_t rv;
@@ -510,37 +237,10 @@ static int remoteip_modify_request(reque
*/
void *internal = NULL;
- /* No header defined or results from our input filter */
- if (!config->header_name && !conn_config) {
+ if (!config->header_name) {
return DECLINED;
}
- /* Easy parsing case - just position the data we already have from PROXY
- protocol handling allowing it to take precedence and return
- */
- if (conn_config) {
- /* We may have gotten here if processing was optional - check for that */
- if (!conn_config->client_addr) {
- if (config->pp_optional) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03495)
- "RemoteIPProxyProtocol data is missing, but was optional. Allowing request.");
- return OK;
- }
- else {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(03496)
- "RemoteIPProxyProtocol data is missing, but required! Aborting request.");
- return HTTP_BAD_REQUEST;
- }
- }
-
- r->useragent_addr = conn_config->client_addr;
- r->useragent_ip = conn_config->client_ip;
-
- ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
- "Using %s as client's IP from PROXY protocol", r->useragent_ip);
- return OK;
- }
-
if (config->proxymatch_ip) {
/* This indicates that a RemoteIPInternalProxy, RemoteIPInternalProxyList, RemoteIPTrustedProxy
or RemoteIPTrustedProxyList directive is configured.
@@ -724,464 +424,6 @@ static int remoteip_modify_request(reque
return OK;
}
-static int remoteip_is_server_port(apr_port_t port)
-{
- ap_listen_rec *lr;
-
- for (lr = ap_listeners; lr; lr = lr->next) {
- if (lr->bind_addr && lr->bind_addr->port == port) {
- return 1;
- }
- }
-
- return 0;
-}
-
-/*
- * Human readable format:
- * PROXY {TCP4|TCP6|UNKNOWN} <client-ip-addr> <dest-ip-addr> <client-port> <dest-port><CR><LF>
- */
-static remoteip_parse_status_t remoteip_process_v1_header(conn_rec *c,
- remoteip_conn_config_t *conn_conf,
- proxy_header *hdr, apr_size_t len,
- apr_size_t *hdr_len)
-{
- char *end, *word, *host, *valid_addr_chars, *saveptr;
- char buf[sizeof(hdr->v1.line)];
- apr_port_t port;
- apr_status_t ret;
- apr_int32_t family;
-
-#define GET_NEXT_WORD(field) \
- word = apr_strtok(NULL, " ", &saveptr); \
- if (!word) { \
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(03497) \
- "RemoteIPProxyProtocol: no " field " found in header '%s'", \
- hdr->v1.line); \
- return HDR_ERROR; \
- }
-
- end = memchr(hdr->v1.line, '\r', len - 1);
- if (!end || end[1] != '\n') {
- return HDR_NEED_MORE; /* partial or invalid header */
- }
-
- *end = '\0';
- *hdr_len = end + 2 - hdr->v1.line; /* skip header + CRLF */
-
- /* parse in separate buffer so have the original for error messages */
- strcpy(buf, hdr->v1.line);
-
- apr_strtok(buf, " ", &saveptr);
-
- /* parse family */
- GET_NEXT_WORD("family")
- if (strcmp(word, "UNKNOWN") == 0) {
- conn_conf->client_addr = c->client_addr;
- conn_conf->client_ip = c->client_ip;
- return HDR_DONE;
- }
- else if (strcmp(word, "TCP4") == 0) {
- family = APR_INET;
- valid_addr_chars = "0123456789.";
- }
- else if (strcmp(word, "TCP6") == 0) {
-#if APR_HAVE_IPV6
- family = APR_INET6;
- valid_addr_chars = "0123456789abcdefABCDEF:";
-#else
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(03498)
- "RemoteIPProxyProtocol: Unable to parse v6 address - APR is not compiled with IPv6 support",
- word, hdr->v1.line);
- return HDR_ERROR;
-#endif
- }
- else {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(03499)
- "RemoteIPProxyProtocol: unknown family '%s' in header '%s'",
- word, hdr->v1.line);
- return HDR_ERROR;
- }
-
- /* parse client-addr */
- GET_NEXT_WORD("client-address")
-
- if (strspn(word, valid_addr_chars) != strlen(word)) {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(03500)
- "RemoteIPProxyProtocol: invalid client-address '%s' found in "
- "header '%s'", word, hdr->v1.line);
- return HDR_ERROR;
- }
-
- host = word;
-
- /* parse dest-addr */
- GET_NEXT_WORD("destination-address")
-
- /* parse client-port */
- GET_NEXT_WORD("client-port")
- if (sscanf(word, "%hu", &port) != 1) {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(03501)
- "RemoteIPProxyProtocol: error parsing port '%s' in header '%s'",
- word, hdr->v1.line);
- return HDR_ERROR;
- }
-
- /* parse dest-port */
- /* GET_NEXT_WORD("destination-port") - no-op since we don't care about it */
-
- /* create a socketaddr from the info */
- ret = apr_sockaddr_info_get(&conn_conf->client_addr, host, family, port, 0,
- c->pool);
- if (ret != APR_SUCCESS) {
- conn_conf->client_addr = NULL;
- ap_log_cerror(APLOG_MARK, APLOG_ERR, ret, c, APLOGNO(03502)
- "RemoteIPProxyProtocol: error converting family '%d', host '%s',"
- " and port '%hu' to sockaddr; header was '%s'",
- family, host, port, hdr->v1.line);
- return HDR_ERROR;
- }
-
- conn_conf->client_ip = apr_pstrdup(c->pool, host);
-
- return HDR_DONE;
-}
-
-/** Add our filter to the connection if it is requested
- */
-static int remoteip_hook_pre_connection(conn_rec *c, void *csd)
-{
- remoteip_config_t *conf;
- remoteip_conn_config_t *conn_conf;
- int optional;
-
- conf = ap_get_module_config(ap_server_conf->module_config,
- &remoteip_module);
-
- /* Used twice - do the check only once */
- optional = remoteip_addr_in_list(conf->proxy_protocol_optional, c->local_addr);
-
- /* check if we're enabled for this connection */
- if ((!remoteip_addr_in_list(conf->proxy_protocol_enabled, c->local_addr)
- && !optional )
- || remoteip_addr_in_list(conf->proxy_protocol_disabled, c->local_addr)) {
- return DECLINED;
- }
-
- /* mod_proxy creates outgoing connections - we don't want those */
- if (!remoteip_is_server_port(c->local_addr->port)) {
- return DECLINED;
- }
-
- /* add our filter */
- if (!ap_add_input_filter(remoteip_filter_name, NULL, NULL, c)) {
- /* XXX: Shouldn't this WARN in log? */
- return DECLINED;
- }
-
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(03503)
- "RemoteIPProxyProtocol: enabled on connection to %s:%hu",
- c->local_ip, c->local_addr->port);
-
- /* this holds the resolved proxy info for this connection */
- conn_conf = apr_pcalloc(c->pool, sizeof(*conn_conf));
-
- /* Propagate the optional flag so the connection handler knows not to
- abort if the header is mising. NOTE: This means we must check after
- we read the request that the header was NOT optional, too.
- */
- conn_conf->proxy_protocol_optional = optional;
-
- ap_set_module_config(c->conn_config, &remoteip_module, conn_conf);
-
- return OK;
-}
-
-/* Binary format:
- * <sig><cmd><proto><addr-len><addr>
- * sig = \x0D \x0A \x0D \x0A \x00 \x0D \x0A \x51 \x55 \x49 \x54 \x0A
- * cmd = <4-bits-version><4-bits-command>
- * 4-bits-version = \x02
- * 4-bits-command = {\x00|\x01} (\x00 = LOCAL: discard con info; \x01 = PROXY)
- * proto = <4-bits-family><4-bits-protocol>
- * 4-bits-family = {\x00|\x01|\x02|\x03} (AF_UNSPEC, AF_INET, AF_INET6, AF_UNIX)
- * 4-bits-protocol = {\x00|\x01|\x02} (UNSPEC, STREAM, DGRAM)
- */
-static remoteip_parse_status_t remoteip_process_v2_header(conn_rec *c,
- remoteip_conn_config_t *conn_conf,
- proxy_header *hdr)
-{
- apr_status_t ret;
-
- switch (hdr->v2.ver_cmd & 0xF) {
- case 0x01: /* PROXY command */
- switch (hdr->v2.fam) {
- case 0x11: /* TCPv4 */
- ret = apr_sockaddr_info_get(&conn_conf->client_addr, NULL,
- APR_INET,
- ntohs(hdr->v2.addr.ip4.src_port),
- 0, c->pool);
- if (ret != APR_SUCCESS) {
- conn_conf->client_addr = NULL;
- ap_log_cerror(APLOG_MARK, APLOG_ERR, ret, c, APLOGNO(03504)
- "RemoteIPPProxyProtocol: error creating sockaddr");
- return HDR_ERROR;
- }
-
- conn_conf->client_addr->sa.sin.sin_addr.s_addr =
- hdr->v2.addr.ip4.src_addr;
- break;
-
- case 0x21: /* TCPv6 */
-#if APR_HAVE_IPV6
- ret = apr_sockaddr_info_get(&conn_conf->client_addr, NULL,
- APR_INET6,
- ntohs(hdr->v2.addr.ip6.src_port),
- 0, c->pool);
- if (ret != APR_SUCCESS) {
- conn_conf->client_addr = NULL;
- ap_log_cerror(APLOG_MARK, APLOG_ERR, ret, c, APLOGNO(03505)
- "RemoteIPProxyProtocol: error creating sockaddr");
- return HDR_ERROR;
- }
- memcpy(&conn_conf->client_addr->sa.sin6.sin6_addr.s6_addr,
- hdr->v2.addr.ip6.src_addr, 16);
- break;
-#else
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(03506)
- "RemoteIPProxyProtocol: APR is not compiled with IPv6 support");
- return HDR_ERROR;
-#endif
- default:
- /* unsupported protocol, keep local connection address */
- return HDR_DONE;
- }
- break; /* we got a sockaddr now */
-
- case 0x00: /* LOCAL command */
- /* keep local connection address for LOCAL */
- return HDR_DONE;
-
- default:
- /* not a supported command */
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(03507)
- "RemoteIPProxyProtocol: unsupported command %.2hx",
- (unsigned short)hdr->v2.ver_cmd);
- return HDR_ERROR;
- }
-
- /* got address - compute the client_ip from it */
- ret = apr_sockaddr_ip_get(&conn_conf->client_ip, conn_conf->client_addr);
- if (ret != APR_SUCCESS) {
- conn_conf->client_addr = NULL;
- ap_log_cerror(APLOG_MARK, APLOG_ERR, ret, c, APLOGNO(03508)
- "RemoteIPProxyProtocol: error converting address to string");
- return HDR_ERROR;
- }
-
- return HDR_DONE;
-}
-
-/** Determine if this is a v1 or v2 PROXY header.
- */
-static int remoteip_determine_version(conn_rec *c, const char *ptr)
-{
- proxy_header *hdr = (proxy_header *) ptr;
-
- /* assert len >= 14 */
-
- if (memcmp(&hdr->v2, v2sig, sizeof(v2sig)) == 0 &&
- (hdr->v2.ver_cmd & 0xF0) == 0x20) {
- return 2;
- }
- else if (memcmp(hdr->v1.line, "PROXY ", 6) == 0) {
- return 1;
- }
- else {
- return -1;
- }
-}
-
-/* Capture the first bytes on the protocol and parse the proxy protocol header.
- * Removes itself when the header is complete.
- */
-static apr_status_t remoteip_input_filter(ap_filter_t *f,
- apr_bucket_brigade *bb_out,
- ap_input_mode_t mode,
- apr_read_type_e block,
- apr_off_t readbytes)
-{
- apr_status_t ret;
- remoteip_filter_context *ctx = f->ctx;
- remoteip_conn_config_t *conn_conf;
- apr_bucket *b;
- remoteip_parse_status_t psts;
- const char *ptr;
- apr_size_t len;
-
- if (f->c->aborted) {
- return APR_ECONNABORTED;
- }
-
- /* allocate/retrieve the context that holds our header */
- if (!ctx) {
- ctx = f->ctx = apr_palloc(f->c->pool, sizeof(*ctx));
- ctx->rcvd = 0;
- ctx->need = MIN_HDR_LEN;
- ctx->version = 0;
- ctx->mode = AP_MODE_READBYTES;
- ctx->bb = apr_brigade_create(f->c->pool, f->c->bucket_alloc);
- ctx->done = 0;
- }
-
- if (ctx->done) {
- /* Note: because we're a connection filter we can't remove ourselves
- * when we're done, so we have to stay in the chain and just go into
- * passthrough mode.
- */
- return ap_get_brigade(f->next, bb_out, mode, block, readbytes);
- }
-
- conn_conf = ap_get_module_config(f->c->conn_config, &remoteip_module);
-
- /* try to read a header's worth of data */
- while (!ctx->done) {
- if (APR_BRIGADE_EMPTY(ctx->bb)) {
- ret = ap_get_brigade(f->next, ctx->bb, ctx->mode, block,
- ctx->need - ctx->rcvd);
- if (ret != APR_SUCCESS) {
- return ret;
- }
- }
- if (APR_BRIGADE_EMPTY(ctx->bb)) {
- return APR_EOF;
- }
-
- while (!ctx->done && !APR_BRIGADE_EMPTY(ctx->bb)) {
- b = APR_BRIGADE_FIRST(ctx->bb);
-
- ret = apr_bucket_read(b, &ptr, &len, block);
- if (APR_STATUS_IS_EAGAIN(ret) && block == APR_NONBLOCK_READ) {
- return APR_SUCCESS;
- }
- if (ret != APR_SUCCESS) {
- return ret;
- }
-
- memcpy(ctx->header + ctx->rcvd, ptr, len);
- ctx->rcvd += len;
-
- /* Remove instead of delete - we may put this bucket
- back into bb_out if the header was optional and we
- pass down the chain */
- APR_BUCKET_REMOVE(b);
- psts = HDR_NEED_MORE;
-
- if (ctx->version == 0) {
- /* reading initial chunk */
- if (ctx->rcvd >= MIN_HDR_LEN) {
- ctx->version = remoteip_determine_version(f->c, ctx->header);
- if (ctx->version < 0) {
- psts = HDR_MISSING;
- }
- else if (ctx->version == 1) {
- ctx->mode = AP_MODE_GETLINE;
- ctx->need = sizeof(proxy_v1);
- }
- else if (ctx->version == 2) {
- ctx->need = MIN_V2_HDR_LEN;
- }
- }
- }
- else if (ctx->version == 1) {
- psts = remoteip_process_v1_header(f->c, conn_conf,
- (proxy_header *) ctx->header,
- ctx->rcvd, &ctx->need);
- }
- else if (ctx->version == 2) {
- if (ctx->rcvd >= MIN_V2_HDR_LEN) {
- ctx->need = MIN_V2_HDR_LEN +
- ntohs(((proxy_header *) ctx->header)->v2.len);
- }
- if (ctx->rcvd >= ctx->need) {
- psts = remoteip_process_v2_header(f->c, conn_conf,
- (proxy_header *) ctx->header);
- }
- }
- else {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c, APLOGNO(03509)
- "RemoteIPProxyProtocol: internal error: unknown version "
- "%d", ctx->version);
- f->c->aborted = 1;
- apr_bucket_delete(b);
- apr_brigade_destroy(ctx->bb);
- return APR_ECONNABORTED;
- }
-
- switch (psts) {
- case HDR_MISSING:
- if (conn_conf->proxy_protocol_optional) {
- /* Same as DONE, but don't delete the bucket. Rather, put it
- back into the brigade and move the request along the stack */
- ctx->done = 1;
- APR_BRIGADE_INSERT_HEAD(bb_out, b);
- return ap_pass_brigade(f->next, ctx->bb);
- }
- else {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c, APLOGNO(03510)
- "RemoteIPProxyProtocol: no valid PROXY header found");
- /* fall through to error case */
- }
- case HDR_ERROR:
- f->c->aborted = 1;
- apr_bucket_delete(b);
- apr_brigade_destroy(ctx->bb);
- return APR_ECONNABORTED;
-
- case HDR_DONE:
- apr_bucket_delete(b);
- ctx->done = 1;
- break;
-
- case HDR_NEED_MORE:
- /* It is safe to delete this bucket if we get here since we know
- that we are definitely processing a header (we've read enough to
- know if the signatures exist on the line) */
- apr_bucket_delete(b);
- break;
- }
- }
- }
-
- /* we only get here when done == 1 */
- if (psts == HDR_DONE) {
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c, APLOGNO(03511)
- "RemoteIPProxyProtocol: received valid PROXY header: %s:%hu",
- conn_conf->client_ip, conn_conf->client_addr->port);
- }
- else {
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c, APLOGNO(03512)
- "RemoteIPProxyProtocol: PROXY header was missing");
- }
-
- if (ctx->rcvd > ctx->need || !APR_BRIGADE_EMPTY(ctx->bb)) {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c, APLOGNO(03513)
- "RemoteIPProxyProtocol: internal error: have data left over; "
- " need=%lu, rcvd=%lu, brigade-empty=%d", ctx->need,
- ctx->rcvd, APR_BRIGADE_EMPTY(ctx->bb));
- f->c->aborted = 1;
- apr_brigade_destroy(ctx->bb);
- return APR_ECONNABORTED;
- }
-
- /* clean up */
- apr_brigade_destroy(ctx->bb);
- ctx->bb = NULL;
-
- /* now do the real read for the upper layer */
- return ap_get_brigade(f->next, bb_out, mode, block, readbytes);
-}
-
static const command_rec remoteip_cmds[] =
{
AP_INIT_TAKE1("RemoteIPHeader", header_name_set, NULL, RSRC_CONF,
@@ -1205,21 +447,11 @@ static const command_rec remoteip_cmds[]
RSRC_CONF | EXEC_ON_READ,
"The filename to read the list of internal proxies, "
"see the RemoteIPInternalProxy directive"),
- AP_INIT_TAKE1("RemoteIPProxyProtocolEnable", remoteip_enable_proxy_protocol, NULL,
- RSRC_CONF, "Enable proxy-protocol handling (`on', `off')"),
{ NULL }
};
static void register_hooks(apr_pool_t *p)
{
- /* mod_ssl is CONNECTION + 5, so we want something higher (earlier);
- * mod_reqtimeout is CONNECTION + 8, so we want something lower (later) */
- ap_register_input_filter(remoteip_filter_name, remoteip_input_filter, NULL,
- AP_FTYPE_CONNECTION + 7);
-
- ap_hook_pre_config(remoteip_hook_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_post_config(remoteip_hook_post_config, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_pre_connection(remoteip_hook_pre_connection, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_read_request(remoteip_modify_request, NULL, NULL, APR_HOOK_FIRST);
}