[prev in list] [next in list] [prev in thread] [next in thread]
List: apache-cvs
Subject: svn commit: r1830248 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/http/http_request.c
From: jim () apache ! org
Date: 2018-04-26 17:35:44
Message-ID: 20180426173544.F012C3A0096 () svn01-us-west ! apache ! org
[Download RAW message or body]
Author: jim
Date: Thu Apr 26 17:35:44 2018
New Revision: 1830248
URL: http://svn.apache.org/viewvc?rev=1830248&view=rev
Log:
Merge r1828920 from trunk:
PR62186: preserve %<m for ErrorDocument internal redirects
*) core: Preserve the original HTTP request method in the '%<m' LogFormat
when an path-based ErrorDocument is used. PR 62186.
[Micha Lenk <micha lenk.info>]
Submitted By: Micha Lenk
Committed By: covener
Submitted by: covener
Reviewed by: covener, jhriggs, jim
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/modules/http/http_request.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 26 17:35:44 2018
@@ -8,4 +8,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,12 \
00580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702, \
1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,120119 \
4,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203 \
400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,12 \
05379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835, \
1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,120975 \
4,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209 \
916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,12 \
10221,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,122120 \
5,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225 \
197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,12 \
27910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286, \
1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,123283 \
8,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235 \
019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,12 \
40470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799, \
1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,129353 \
4-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297 \
560,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,131 \
1468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1 \
326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115 \
,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,13430 \
87,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,134 \
8656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1 \
352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773 \
,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,13631 \
83,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,136 \
4133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1 \
366621,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,1374214,1374216,1374247,1374874,137487 \
7,1374880,1375006,1375009,1375011,1375013,1375445,1375584,1376695,1376700,1378178,1383 \
490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,13 \
87110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447, \
1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-138956 \
9,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392 \
347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,13 \
95792,1396440,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066, \
1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,140347 \
6,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1
407381,1407459-1407460,1407528,1407853,1407965,1408093,1408402,1408958,1408961,14091 \
70,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,141 \
5023,1415075,1416121,1416150,1416278,1417197,1417440,1417529,1418524,1418556,1418648,1 \
418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796 \
,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421323,14218 \
51,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,142 \
3353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1 \
428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869 \
,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,14391 \
06,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,144 \
8171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,145357
4,1453604,1453875-1453876,1453963,1453981,1454386,1454414-1454415,1454888,1457437,14 \
57450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285, \
1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463049,1463052,1463056,146345 \
5,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467593,1467 \
765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-14 \
76645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411, \
1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,148189 \
1,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484 \
398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1487775,1488158,14 \
88164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155, \
1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492395,1492663,1492710,1492782,1493257,1493330,1493921,1493925,1494532,1494536,149
5501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,1499679,1500323,1500345 \
,1500362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501827,1501913,15026 \
65,1502772,1503680,1503866,1503990-1503991,1504276,1506474,1506714,1509872,1509983,151 \
0084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1 \
514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045 \
,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,15209 \
08,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,152 \
4770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1 \
527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449 \
,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,15322 \
81,1532289,1532746,1532816,1533065,1533224,1533810,1533935,1534321,1534754,1534890,1534892,1534895-1534896,1534914,1536310,1537535,1537718,
1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542 \
615,1543020,1543147,1543149,1543174,1544381,1544774,1544784,1544812,1544820,1545286,15 \
45292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801, \
1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551611,1551685,155171 \
4,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554 \
179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-15 \
54995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569, \
1556206,1556428,1556473,1556911-1556912,1556914,1556937,1557317,1557617,1558483,155935 \
1,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561 \
385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,15 \
64437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,15726
55,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1 \
574151,1575400,1576233,1576741,1578760,1578762,1580568,1580928,1580935,1583005,1583007 \
-1583008,1583027,1583175,1583191,1584098,1584417,1584430,1584434,1584572,1584653,15846 \
58,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585157,1585435,158 \
5609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1 \
587607,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704 \
,1588851,1588853,1588868,1589413,1590437,1590509,1591143,1591320,1591322,1591328,15913 \
90,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,159 \
2615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1 \
597352,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,16
04631,1605207,1605328,1605827,1605829,1607960,1608284,1608785,1608999,1609914,160993 \
6,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611 \
244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1617913,1618401,1618541,16 \
18555,1619297,1619383,1619444,1619483,1619835,1620324,1620461,1620932,1621367,1621372, \
1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626956,162697 \
8,1628104,1628388,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629 \
372,1629440-1629441,1629485,1629507-1629508,1629519,1629576-1629577,1629652,1629916,16 \
31885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736, \
1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,163961 \
4,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642 \
499,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,165 \
2829,1652929,1652931,1652955,1652982,1652985,1652989,1653941,1653978,1653997,1656225,1 \
656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067 \
,1661258,1661448,1661464,1661486,1662245-1662246,1662437,1663017,1663647,1664071,16641 \
33,1664205,1664299,1664565,1664709,1665215-1665216,1665218,1665625,1665643,1665721,166 \
6297,1666361,1666363,1666415,1666417,1666468,1666617-1666618,1666998,1667385-1667386,1 \
667676,1667707,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396 \
-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,16729 \
89,1673113,1673155,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,167 \
4697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1 \
677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,1679032,1679181-1679182,1679192,1679
428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424, \
1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,168297 \
9,1682988,1683044,1683047,1683123,1683881,1683884,1684057,1684171,1684636,1684900,1685 \
069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,16 \
86856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688399,1688474- \
1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,169024 \
8,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693 \
918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,16 \
95920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755, \
1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,169763 \
4,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1698334,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1
700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,17011 \
45,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1702948,1703152,170 \
3241,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1 \
704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776 \
,1705823,1705826,1705828,1705833,1705922,1705983,1706275,1706523,1706595,1706627,17066 \
35,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707512,170 \
7519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1 \
709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710403,1710419,1710572 \
,1710583,1710723,1711479,1711553,1711648,1711728,1711902,1712382,1713040,1713043,17132 \
09,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-171 \
5585,1715886,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,171833
8,1718400,1718476,1718496,1718514,1718556,1718569,1718598,1719016,1719018,1719189-17 \
19190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899, \
1722137,1722154,1722177,1722195,1722229,1722320,1722328,1722334,1722350-1722351,172235 \
8,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723522,1723567,1723953,1724 \
847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,17 \
25325,1725328,1725387,1725392,1725394-1725395,1725445,1725468,1725485,1725489,1725498- \
1725499,1725516,1725523,1725545,1725567,1725581,1725602,1725822,1725940,1725967,172600 \
9,1726026,1726038,1726049,1726051-1726052,1726055,1726086,1726167,1726233,1726675,1726 \
705,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,17 \
28326,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-173
3089,1733275,1733523,1733537-1733538,1733691,1734006,1734125,1734239,1734294,1734412 \
,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-17356 \
09,1735611,1735668,1735786,1735891,1735906,1735931,1735935,1735942,1735952,1736156,173 \
6186,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1 \
737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1738217,1738331 \
,1738333,1738464,1738466,1738486,1738563,1738628,1738631,1738633,1738635,1739008,17391 \
46,1739151,1739193,1739201,1739303,1739312,1739738,1739932,1740075,1740084,1740108,174 \
0110,1740155,1740735,1740910,1740928,1740960,1740967,1740987,1740998,1741045,1741065,1 \
741112,1741115,1741268,1741277,1741310,1741392,1741414,1741446,1741461,1741557,1741564 \
,1741570,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-17424 \
47,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,1745 \
863-1745864,1746207,1746647,1746988,1747170,1747469,1747531,1747550,1747735,1747808,17 \
47810,1747946,1748047,1748155,1748368,1748448,1748531,1748653,1748888,1749151,1749401, \
1749404,1749505,1749658-1749659,1749676,1749678,1749695,1749924-1749925,1750043,175021 \
8,1750335,1750392,1750407,1750412,1750416,1750420,1750474,1750494,1750507-1750508,1750 \
553,1750567,1750750,1750779,1750854-1750855,1750947,1750955,1750960,1751970,1752087,17 \
52096,1752145,1752331-1752333,1752347,1752415,1753167,1753224,1753228-1753229,1753257, \
1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754164,1754391,175439 \
9,1754414,1754534,1755323,1756038,1756542,1756553,1756611,1756631,1756844,1756846,1756 \
848,1756852-1756853,1756976,1757009-1757011,1757029-1757031,1757061,1757524,1757534,17 \
57540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759415,1759984,1760018,1761434,1761477,1761479,1761548,17617
14,1761824,1762512,1762515,1762517,1762580,1762701-1762703,1762718,1762723,1762742-1 \
762743,1763158,1763246,1763613,1764005,1764040,1764046,1764236,1764243,1764255,1765318 \
,1765328,1765357,1765420,1766097,1766129,1766160,1766308,1766424,1766691,1766851,17668 \
57,1766998,1767128,1767180-1767181,1767553,1767564,1767803,1767936,1768160,1768245,176 \
9192,1769332,1769550,1769593,1769596,1769600,1770395,1770750,1770752,1770768,1770771,1 \
770828,1770951,1770998,1771001,1771015,1771789,1771791,1771827,1772339,1772489,1772504 \
,1772576,1772812-1772813,1772919,1773159,1773162,1773293,1773346,1773397,1773761,17737 \
79,1773812,1773861-1773862,1773865,1774008,1774018,1774023,1774068-1774069,1774286,177 \
4288,1774538,1774541,1774602,1774609,1775173,1775195,1775199,1775487,1775664,1775770,1 \
775775,1775813,1775833,1775858,1775944,1775946,1776459,1776463,1776575,1776578,1776624 \
,1776627,1776674,1776734-1776735,1776738,1776740,1776956,1777160,1777324,1777354,1777460,1777556-1777557,1777593-1777594,1777672,1777923,17
78268,1778319,1778331,1778350,1778630,1779077,1779091,1779111,1779354,1779459,177952 \
5,1779528,1779573-1779574,1779623,1779699,1779738,1779743,1779896,1779972,1779979,1780 \
095,1780159,1780308,1780328-1780329,1780576,1780596,1780598,1780725,1780971,1781030-17 \
81031,1781187,1781190,1781304,1781312-1781313,1781324,1781328-1781329,1781509,1781516, \
1781575,1781577,1781580,1781687,1781701,1782164,1782166,1782193-1782194,1782323,178241 \
8-1782419,1782482,1782532,1782875,1782944,1782958,1782975,1783056,1783305,1783722-1783 \
723,1783764-1783765,1783770,1783842,1783849,1784002,1784203,1784205,1784227-1784228,17 \
84275,1784318,1784366,1784372,1784571,1785115,1785672,1785683,1785752-1785753,1785871, \
1785907,1786009,1786512,1786575-1786576,1786715,1787051,1787053,1787141,1787525,178755 \
3,1787604,1788032-1788033,1788040,1788430,1788451,1788508,1788672,1788674,1788981,1788 \
996,1788998,1789000,1789220-1789221,1789224,1789276,1789279,1789387,1789395,1789520,1789535,1789692,1789740,1789800,1790102,1790113,1790169
,1790284,1790457,1790691,1790754,1790826-1790827,1790842,1790850,1790852-1790853,179 \
0855,1790860,1790973,1790978,1791377,1791388,1791400,1791669,1791773,1791790,1791975,1 \
792092,1792195,1792212,1792589,1792675,1793525,1793533,1793932,1794049,1795635,1795651 \
,1795830,1795931,1796343,1796348,1796350,1796446,1796493,1796864,1797550,1797745,17987 \
444,1808671,1808723,1808746,1808780,1809028,1809209,1809273,1809302-1809303,1809305,1 \
809311,1809314,1809713,1809719,1809881,1809888,1809973,1809976,1809981,1810088-1810089 \
,1810358,1810362-1810363,1810365,1810447,1810723,1811082,1811192,1811285,1811540-18115 \
41,1811569-1811570,1811649,1811664,1811744,1811812,1811976,1812004,1812075,1812193,181 \
2263,1812301,1812307,1812332,1812517-1812518,1812756,1812999,1813642-1813643,1813991,1 \
814118,1814719-1814720,1814939,1814968,1815005,1815078,1815264,1815370,1815483,1816055 \
,1816110,1816154,1816156,1816534,1816552,1816558,1816619,1816919,1816922,1816970,18170 \
23,1817777,1817785,1818013,1818040,1818120,1818122,1818278-1818280,1818308,1818624,181 \
8725,1818792,1818802,1818804,1818825,1818849,1818951,1818958,1818960,1819027,1819214,1 \
819847-1819848,1819852-1819853,1819855,1819969-1819970,1820035,1820101,1820464,1820808 \
-1820809,1821095,1821371,1821374,1821504-1821505,1821558,1821561-1821562,1821595,1821624-1821627,1821629,1821632,1821635,1821639,1821644,1
821647-1821651,1821659-1821660,1821767,1822305,1822366-1822367,1822502-1822503,18225 \
09,1822511,1822624,1822931,1823047,1823179,1823412,1823415-1823416,1823482,1823564,182 \
3572,1823575,1823886,1824176,1824303,1824332,1824336,1824343,1824381,1824390,1824454,1 \
824460,1824463-1824464,1824482,1824497,1824811,1824862,1824877,1824973,1825147,1825169 \
,1825368,1825370,1825467,1825504,1826207,1826556,1826686,1826845,1826847,1826973,1827196,1827599,1827604,1827654,1827671,1827783,1827865,1828390,1828669
+/httpd/httpd/trunk:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1 \
200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702 \
,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,12011 \
94,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,120 \
3400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1 \
205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835 \
,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,12097 \
54,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,120 \
9916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1 \
210221,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,122120 \
5,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225 \
197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,12 \
27910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286, \
1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,123283 \
8,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235 \
019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,12 \
40470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799, \
1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,129353 \
4-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297 \
560,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,131 \
1468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1 \
326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115 \
,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,13430 \
87,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,134 \
8656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1 \
352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773 \
,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,13631 \
83,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,136 \
4133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1 \
366621,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,1374214,1374216,1374247,1374874,137487 \
7,1374880,1375006,1375009,1375011,1375013,1375445,1375584,1376695,1376700,1378178,1383 \
490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,13 \
87110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447, \
1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-138956 \
9,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392 \
347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,13 \
95792,1396440,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066, \
1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,140347 \
6,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1
407381,1407459-1407460,1407528,1407853,1407965,1408093,1408402,1408958,1408961,14091 \
70,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,141 \
5023,1415075,1416121,1416150,1416278,1417197,1417440,1417529,1418524,1418556,1418648,1 \
418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796 \
,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421323,14218 \
51,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,142 \
3353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1 \
428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869 \
,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,14391 \
06,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,144 \
8171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,145357
4,1453604,1453875-1453876,1453963,1453981,1454386,1454414-1454415,1454888,1457437,14 \
57450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285, \
1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463049,1463052,1463056,146345 \
5,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467593,1467 \
765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-14 \
76645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411, \
1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,148189 \
1,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484 \
398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1487775,1488158,14 \
88164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155, \
1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492395,1492663,1492710,1492782,1493257,1493330,1493921,1493925,1494532,1494536,149
5501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,1499679,1500323,1500345 \
,1500362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501827,1501913,15026 \
65,1502772,1503680,1503866,1503990-1503991,1504276,1506474,1506714,1509872,1509983,151 \
0084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1 \
514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045 \
,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,15209 \
08,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,152 \
4770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1 \
527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449 \
,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,15322 \
81,1532289,1532746,1532816,1533065,1533224,1533810,1533935,1534321,1534754,1534890,1534892,1534895-1534896,1534914,1536310,1537535,1537718,
1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542 \
615,1543020,1543147,1543149,1543174,1544381,1544774,1544784,1544812,1544820,1545286,15 \
45292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801, \
1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551611,1551685,155171 \
4,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554 \
179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-15 \
54995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569, \
1556206,1556428,1556473,1556911-1556912,1556914,1556937,1557317,1557617,1558483,155935 \
1,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561 \
385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,15 \
64437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,15726
55,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1 \
574151,1575400,1576233,1576741,1578760,1578762,1580568,1580928,1580935,1583005,1583007 \
-1583008,1583027,1583175,1583191,1584098,1584417,1584430,1584434,1584572,1584653,15846 \
58,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585157,1585435,158 \
5609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1 \
587607,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704 \
,1588851,1588853,1588868,1589413,1590437,1590509,1591143,1591320,1591322,1591328,15913 \
90,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,159 \
2615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1 \
597352,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,16
04631,1605207,1605328,1605827,1605829,1607960,1608284,1608785,1608999,1609914,160993 \
6,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611 \
244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1617913,1618401,1618541,16 \
18555,1619297,1619383,1619444,1619483,1619835,1620324,1620461,1620932,1621367,1621372, \
1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626956,162697 \
8,1628104,1628388,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629 \
372,1629440-1629441,1629485,1629507-1629508,1629519,1629576-1629577,1629652,1629916,16 \
31885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736, \
1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,163961 \
4,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642 \
499,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,165 \
2829,1652929,1652931,1652955,1652982,1652985,1652989,1653941,1653978,1653997,1656225,1 \
656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067 \
,1661258,1661448,1661464,1661486,1662245-1662246,1662437,1663017,1663647,1664071,16641 \
33,1664205,1664299,1664565,1664709,1665215-1665216,1665218,1665625,1665643,1665721,166 \
6297,1666361,1666363,1666415,1666417,1666468,1666617-1666618,1666998,1667385-1667386,1 \
667676,1667707,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396 \
-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,16729 \
89,1673113,1673155,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,167 \
4697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1 \
677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,1679032,1679181-1679182,1679192,1679
428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424, \
1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,168297 \
9,1682988,1683044,1683047,1683123,1683881,1683884,1684057,1684171,1684636,1684900,1685 \
069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,16 \
86856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688399,1688474- \
1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,169024 \
8,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693 \
918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,16 \
95920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755, \
1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,169763 \
4,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1698334,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1
700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,17011 \
45,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1702948,1703152,170 \
3241,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1 \
704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776 \
,1705823,1705826,1705828,1705833,1705922,1705983,1706275,1706523,1706595,1706627,17066 \
35,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707512,170 \
7519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1 \
709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710403,1710419,1710572 \
,1710583,1710723,1711479,1711553,1711648,1711728,1711902,1712382,1713040,1713043,17132 \
09,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-171 \
5585,1715886,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,171833
8,1718400,1718476,1718496,1718514,1718556,1718569,1718598,1719016,1719018,1719189-17 \
19190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899, \
1722137,1722154,1722177,1722195,1722229,1722320,1722328,1722334,1722350-1722351,172235 \
8,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723522,1723567,1723953,1724 \
847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,17 \
25325,1725328,1725387,1725392,1725394-1725395,1725445,1725468,1725485,1725489,1725498- \
1725499,1725516,1725523,1725545,1725567,1725581,1725602,1725822,1725940,1725967,172600 \
9,1726026,1726038,1726049,1726051-1726052,1726055,1726086,1726167,1726233,1726675,1726 \
705,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,17 \
28326,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-173
3089,1733275,1733523,1733537-1733538,1733691,1734006,1734125,1734239,1734294,1734412 \
,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-17356 \
09,1735611,1735668,1735786,1735891,1735906,1735931,1735935,1735942,1735952,1736156,173 \
6186,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1 \
737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1738217,1738331 \
,1738333,1738464,1738466,1738486,1738563,1738628,1738631,1738633,1738635,1739008,17391 \
46,1739151,1739193,1739201,1739303,1739312,1739738,1739932,1740075,1740084,1740108,174 \
0110,1740155,1740735,1740910,1740928,1740960,1740967,1740987,1740998,1741045,1741065,1 \
741112,1741115,1741268,1741277,1741310,1741392,1741414,1741446,1741461,1741557,1741564 \
,1741570,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-17424 \
47,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,1745 \
863-1745864,1746207,1746647,1746988,1747170,1747469,1747531,1747550,1747735,1747808,17 \
47810,1747946,1748047,1748155,1748368,1748448,1748531,1748653,1748888,1749151,1749401, \
1749404,1749505,1749658-1749659,1749676,1749678,1749695,1749924-1749925,1750043,175021 \
8,1750335,1750392,1750407,1750412,1750416,1750420,1750474,1750494,1750507-1750508,1750 \
553,1750567,1750750,1750779,1750854-1750855,1750947,1750955,1750960,1751970,1752087,17 \
52096,1752145,1752331-1752333,1752347,1752415,1753167,1753224,1753228-1753229,1753257, \
1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754164,1754391,175439 \
9,1754414,1754534,1755323,1756038,1756542,1756553,1756611,1756631,1756844,1756846,1756 \
848,1756852-1756853,1756976,1757009-1757011,1757029-1757031,1757061,1757524,1757534,17 \
57540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759415,1759984,1760018,1761434,1761477,1761479,1761548,17617
14,1761824,1762512,1762515,1762517,1762580,1762701-1762703,1762718,1762723,1762742-1 \
762743,1763158,1763246,1763613,1764005,1764040,1764046,1764236,1764243,1764255,1765318 \
,1765328,1765357,1765420,1766097,1766129,1766160,1766308,1766424,1766691,1766851,17668 \
57,1766998,1767128,1767180-1767181,1767553,1767564,1767803,1767936,1768160,1768245,176 \
9192,1769332,1769550,1769593,1769596,1769600,1770395,1770750,1770752,1770768,1770771,1 \
770828,1770951,1770998,1771001,1771015,1771789,1771791,1771827,1772339,1772489,1772504 \
,1772576,1772812-1772813,1772919,1773159,1773162,1773293,1773346,1773397,1773761,17737 \
79,1773812,1773861-1773862,1773865,1774008,1774018,1774023,1774068-1774069,1774286,177 \
4288,1774538,1774541,1774602,1774609,1775173,1775195,1775199,1775487,1775664,1775770,1 \
775775,1775813,1775833,1775858,1775944,1775946,1776459,1776463,1776575,1776578,1776624 \
78268,1778319,1778331,1778350,1778630,1779077,1779091,1779111,1779354,1779459,1779525 \
,1779528,1779573-1779574,1779623,1779699,1779738,1779743,1779896,1779972,1779979,17800 \
95,1780159,1780308,1780328-1780329,1780576,1780596,1780598,1780725,1780971,1781030-178 \
1031,1781187,1781190,1781304,1781312-1781313,1781324,1781328-1781329,1781509,1781516,1 \
781575,1781577,1781580,1781687,1781701,1782164,1782166,1782193-1782194,1782323,1782418 \
-1782419,1782482,1782532,1782875,1782944,1782958,1782975,1783056,1783305,1783722-17837 \
23,1783764-1783765,1783770,1783842,1783849,1784002,1784203,1784205,1784227-1784228,178 \
4275,1784318,1784366,1784372,1784571,1785115,1785672,1785683,1785752-1785753,1785871,1 \
785907,1786009,1786512,1786575-1786576,1786715,1787051,1787053,1787141,1787525,1787553 \
,1787604,1788032-1788033,1788040,1788430,1788451,1788508,1788672,1788674,1788981,17889 \
96,1788998,1789000,1789220-1789221,1789224,1789276,1789279,1789387,1789395,1789520,1789535,1789692,1789740,1789800,1790102,1790113,1790169
,1790284,1790457,1790691,1790754,1790826-1790827,1790842,1790850,1790852-1790853,179 \
0855,1790860,1790973,1790978,1791377,1791388,1791400,1791669,1791773,1791790,1791975,1 \
792092,1792195,1792212,1792589,1792675,1793525,1793533,1793932,1794049,1795635,1795651 \
,1795830,1795931,1796343,1796348,1796350,1796446,1796493,1796864,1797550,1797745,17987 \
85,1799341,1799435,1799437,1799784,1799786,1800173,1800306,1800393,1800594,1800689,180 \
0788,1800809,1800815,1800817,1800819,1800830,1800833,1800917,1800919,1800978,1801594,1 \
801665,1801994-1801995,1802040,1802305,1802309,1802336,1802535,1802618,1802845,1802875 \
,1803392,1803396,1803398,1803420,1803454,1804090,1804096,1804530-1804531,1804542,18045 \
45,1804671,1804759,1804787,1804975,1805099,1805180,1805188,1805190,1805192,1805194-180 \
5195,1805206,1805256,1805294,1805322,1805373,1805490,1806939,1806985,1807228,1807238,1 \
807347,1807577,1807593,1807655,1807774,1807777,1807876,1808005,1808008,1808014,1808085,1808092,1808100,1808230,1808241-1808243,1808249,1808
444,1808671,1808723,1808746,1808780,1809028,1809209,1809273,1809302-1809303,1809305, \
1809311,1809314,1809713,1809719,1809881,1809888,1809973,1809976,1809981,1810088-181008 \
9,1810358,1810362-1810363,1810365,1810447,1810723,1811082,1811192,1811285,1811540-1811 \
541,1811569-1811570,1811649,1811664,1811744,1811812,1811976,1812004,1812075,1812193,18 \
12263,1812301,1812307,1812332,1812517-1812518,1812756,1812999,1813642-1813643,1813991, \
1814118,1814719-1814720,1814939,1814968,1815005,1815078,1815264,1815370,1815483,181605 \
5,1816110,1816154,1816156,1816534,1816552,1816558,1816619,1816919,1816922,1816970,1817 \
023,1817777,1817785,1818013,1818040,1818120,1818122,1818278-1818280,1818308,1818624,18 \
18725,1818792,1818802,1818804,1818825,1818849,1818951,1818958,1818960,1819027,1819214, \
1819847-1819848,1819852-1819853,1819855,1819969-1819970,1820035,1820101,1820464,182080 \
8-1820809,1821095,1821371,1821374,1821504-1821505,1821558,1821561-1821562,1821595,1821624-1821627,1821629,1821632,1821635,1821639,1821644,1
821647-1821651,1821659-1821660,1821767,1822305,1822366-1822367,1822502-1822503,18225 \
09,1822511,1822624,1822931,1823047,1823179,1823412,1823415-1823416,1823482,1823564,182 \
3572,1823575,1823886,1824176,1824303,1824332,1824336,1824343,1824381,1824390,1824454,1 \
824460,1824463-1824464,1824482,1824497,1824811,1824862,1824877,1824973,1825147,1825169 \
,1825368,1825370,1825467,1825504,1826207,1826556,1826686,1826845,1826847,1826973,1827196,1827599,1827604,1827654,1827671,1827783,1827865,1828390,1828669,1828920
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1830248&r1=1830247&r2=1830248&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Apr 26 17:35:44 2018
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.34
+ *) core: Preserve the original HTTP request method in the '%<m' LogFormat
+ when an path-based ErrorDocument is used. PR 62186.
+ [Micha Lenk <micha lenk.info>]
+
*) mod_remoteip: make proxy-protocol work on slave connections, e.g. in HTTP/2
requests. See also https://github.com/roadrunner2/mod-proxy-protocol/issues/6
[Stefan Eissing]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1830248&r1=1830247&r2=1830248&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Apr 26 17:35:44 2018
@@ -132,11 +132,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) core: restore r->method after internal redirect to errordocument so %<m
- can be logged. PR62186
- trunk patch: https://svn.apache.org/r1828920
- 2.4.x patch: svn merge -c 1828920 ^/httpd/httpd/trunk .
- +1: covener, jhriggs, jim
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Modified: httpd/httpd/branches/2.4.x/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/http_request.c?rev=1830248&r1=1830247&r2=1830248&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/http_request.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http/http_request.c Thu Apr 26 17:35:44 2018
@@ -186,7 +186,8 @@ static void ap_die_r(int type, request_r
apr_table_setn(r->headers_out, "Location", custom_response);
}
else if (custom_response[0] == '/') {
- const char *error_notes;
+ const char *error_notes, *original_method;
+ int original_method_number;
r->no_local_copy = 1; /* Do NOT send HTTP_NOT_MODIFIED for
* error documents! */
/*
@@ -204,9 +205,14 @@ static void ap_die_r(int type, request_r
"error-notes")) != NULL) {
apr_table_setn(r->subprocess_env, "ERROR_NOTES", error_notes);
}
+ original_method = r->method;
+ original_method_number = r->method_number;
r->method = "GET";
r->method_number = M_GET;
ap_internal_redirect(custom_response, r);
+ /* preserve ability to see %<m in the access log */
+ r->method = original_method;
+ r->method_number = original_method_number;
return;
}
else {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic