Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2878C18ED6 for ; Thu, 18 Feb 2016 15:07:21 +0000 (UTC) Received: (qmail 70326 invoked by uid 500); 18 Feb 2016 15:07:14 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 70262 invoked by uid 500); 18 Feb 2016 15:07:14 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 70253 invoked by uid 99); 18 Feb 2016 15:07:14 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2016 15:07:14 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3B5C7C0F79 for ; Thu, 18 Feb 2016 15:07:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.794 X-Spam-Level: * X-Spam-Status: No, score=1.794 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id dXp-_q5kqo0y for ; Thu, 18 Feb 2016 15:07:09 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 3E4E65FBFA for ; Thu, 18 Feb 2016 15:07:08 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 62647E0113 for ; Thu, 18 Feb 2016 15:07:07 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5FCD83A0140 for ; Thu, 18 Feb 2016 15:07:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1731085 - in /httpd/httpd/branches/2.4.x: ./ modules/aaa/ modules/arch/unix/ modules/arch/win32/ modules/cluster/ modules/dav/main/ modules/examples/ modules/filters/ modules/generators/ modules/http2/ modules/lua/ modules/mappers/ modules... Date: Thu, 18 Feb 2016 15:07:07 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160218150707.5FCD83A0140@svn01-us-west.apache.org> Author: jim Date: Thu Feb 18 15:07:06 2016 New Revision: 1731085 URL: http://svn.apache.org/viewvc?rev=1731085&view=rev Log: Merge r1725485 from trunk: Added many log numbers to log statements that had none. Those were not detected by the coccinelle script. Submitted by: rjung Reviewed/backported by: jim Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/STATUS httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c httpd/httpd/branches/2.4.x/modules/arch/unix/mod_privileges.c httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c httpd/httpd/branches/2.4.x/modules/arch/win32/mod_win32.c httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c httpd/httpd/branches/2.4.x/modules/filters/mod_include.c httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c httpd/httpd/branches/2.4.x/modules/http2/h2_push.c httpd/httpd/branches/2.4.x/modules/http2/h2_session.c httpd/httpd/branches/2.4.x/modules/http2/h2_task_output.c httpd/httpd/branches/2.4.x/modules/http2/h2_util.c httpd/httpd/branches/2.4.x/modules/lua/lua_request.c httpd/httpd/branches/2.4.x/modules/lua/lua_vmprep.c httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c httpd/httpd/branches/2.4.x/modules/proxy/ajp_msg.c httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c httpd/httpd/branches/2.4.x/server/util_script.c httpd/httpd/branches/2.4.x/server/vhost.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 18 15:07:06 2016 @@ -2,4 +2,4 @@ /httpd/httpd/branches/2.4.17-protocols-http2:1701609-1705681 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173 /httpd/httpd/branches/wombat-integration:723609-723841 -/httpd/httpd/trunk:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,1214003,1214005,1214015,12 15514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827,1304087,1304874-1304875,1305167 ,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1311468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,1343087,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368121,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,1369995,1369999,1370 001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374247,1374874,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1378178,1383490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,1387110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447,1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-1389569,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,1395792,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066,1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,1403476,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1407381,1407459-1407460,1407528,1 407853,1407965,1408093,1408402,1408958,1408961,1409170,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,1415023,1415075,1416121,1416150,1416278,1417197,1417529,1418524,1418556,1418648,1418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421323,1421851,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,1423353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,1439106,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,1448171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,1453574,1453604,1453875-1453876,1453963,145398 1,1454386,1454414-1454415,1454888,1457437,1457450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285,1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463052,1463056,1463455,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-1476645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411,1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,1481891,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1488158,1488164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155,1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492663,1492710,1492782,1493330,1493921,1493925,1494536,1495501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,1499679,1500323,1500345,150 0362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506714,1509872,1509983,1510084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,1520908,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,1524770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,1532746,1532816,1533065,1533224,1534321,1534754,1534890,1534892,1536310,1537535,1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542615,1543020,1543147,1543149,1543174,1544381,1544774,1544784,1544812,1544820,1545286, 1545292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801,1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551685,1551714,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-1554995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569,1556206,1556428,1556911-1556912,1556914,1556937,1557317,1557617,1558483,1559351,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,1564437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1574151,1575400,1576233,1576741,1578760,1578762,1580568,1583005,1583007-1583008,1583027,1583175,15831 91,1584098,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585435,1585609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704,1588851,1588853,1589413,1590437,1590509,1591143,1591320,1591322,1591328,1591390,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,1592615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1597352,1597639,1597642,1598107,1598946,1599535,1601076,1601184-1601185,1601274,1601291,1601630,1601919,1601995,1602338,1602978,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1618401,1618541,1619297,1619383,1619444,16 19835,1620324,1620461,1620932,1621367,1621372,1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626978,1628104,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629372,1629440-1629441,1629485,1629507-1629508,1629519,1629577,1629652,1629916,1631885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736,1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,1639614,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642499,1642847,1642868,1643034,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649632,1649966,1650047,1650061,1650309-1650310,1650320,1651088,1652829,1652929,1652931,1652955,1652982,1652985,1652989,1653941,1653978,1653997,1656225,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448,1661464,1661486,1662245-1662246,1663017,1663647,1664071,1664133 ,1664205,1664299,1664709,1665215,1665218,1665625,1665643,1665721,1666297,1666361,1666363,1666468,1666618,1666998,1667385-1667386,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,1672989,1673113,1673155,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,1679032,1679181-1679182,1679192,1679428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424,1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,1682979,1682988,1683044,1683047,1683123,1683881,1683884,1684057,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688 474-1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755,1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,1701145,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1703152,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1705983,1706275,1706627,1706635,1706637,1706640,1706918,1706942,1706989,1707002,1 707230-1707231,1707497,1707519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710419,1710572,1710583,1710723,1711553,1711648,1711728,1711902,1712382,1713040,1713209,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-1715585,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,1718338,1718400,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720996,1721313,1721685,1721899,1722137,1722154,1722572,1722701,1723122,1723143,1723567,1724656,1724847,1724857,1725149,1725325,1725392,1725394-1725395,1725445,1725468,1725516,1725940,1726086,1726233,1726798,1726888,1727317,1727544,1729374 +/httpd/httpd/trunk:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,1214003,1214005,1214015,12 15514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827,1304087,1304874-1304875,1305167 ,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1311468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,1343087,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368121,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,1369995,1369999,1370 001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374247,1374874,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1378178,1383490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,1387110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447,1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-1389569,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,1395792,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066,1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,1403476,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1407381,1407459-1407460,1407528,1 407853,1407965,1408093,1408402,1408958,1408961,1409170,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,1415023,1415075,1416121,1416150,1416278,1417197,1417529,1418524,1418556,1418648,1418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421323,1421851,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,1423353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,1439106,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,1448171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,1453574,1453604,1453875-1453876,1453963,145398 1,1454386,1454414-1454415,1454888,1457437,1457450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285,1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463052,1463056,1463455,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-1476645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411,1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,1481891,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1488158,1488164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155,1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492663,1492710,1492782,1493330,1493921,1493925,1494536,1495501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,1499679,1500323,1500345,150 0362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506714,1509872,1509983,1510084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,1520908,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,1524770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,1532746,1532816,1533065,1533224,1534321,1534754,1534890,1534892,1536310,1537535,1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542615,1543020,1543147,1543149,1543174,1544381,1544774,1544784,1544812,1544820,1545286, 1545292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801,1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551685,1551714,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-1554995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569,1556206,1556428,1556911-1556912,1556914,1556937,1557317,1557617,1558483,1559351,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,1564437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1574151,1575400,1576233,1576741,1578760,1578762,1580568,1583005,1583007-1583008,1583027,1583175,15831 91,1584098,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585435,1585609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704,1588851,1588853,1589413,1590437,1590509,1591143,1591320,1591322,1591328,1591390,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,1592615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1597352,1597639,1597642,1598107,1598946,1599535,1601076,1601184-1601185,1601274,1601291,1601630,1601919,1601995,1602338,1602978,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,1615289,1617018,1618401,1618541,1619297,1619383,1619444,16 19835,1620324,1620461,1620932,1621367,1621372,1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626978,1628104,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629372,1629440-1629441,1629485,1629507-1629508,1629519,1629577,1629652,1629916,1631885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736,1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,1639614,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642499,1642847,1642868,1643034,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649632,1649966,1650047,1650061,1650309-1650310,1650320,1651088,1652829,1652929,1652931,1652955,1652982,1652985,1652989,1653941,1653978,1653997,1656225,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448,1661464,1661486,1662245-1662246,1663017,1663647,1664071,1664133 ,1664205,1664299,1664709,1665215,1665218,1665625,1665643,1665721,1666297,1666361,1666363,1666468,1666618,1666998,1667385-1667386,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,1672989,1673113,1673155,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,1679032,1679181-1679182,1679192,1679428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424,1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,1682979,1682988,1683044,1683047,1683123,1683881,1683884,1684057,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688 474-1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755,1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,1701145,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1703152,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1705983,1706275,1706627,1706635,1706637,1706640,1706918,1706942,1706989,1707002,1 707230-1707231,1707497,1707519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710419,1710572,1710583,1710723,1711553,1711648,1711728,1711902,1712382,1713040,1713209,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-1715585,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,1718338,1718400,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720996,1721313,1721685,1721899,1722137,1722154,1722572,1722701,1723122,1723143,1723567,1724656,1724847,1724857,1725149,1725325,1725392,1725394-1725395,1725445,1725468,1725485,1725516,1725940,1726086,1726233,1726798,1726888,1727317,1727544,1729374 Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Thu Feb 18 15:07:06 2016 @@ -112,12 +112,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) various: APLOGNO - trunk patch: http://svn.apache.org/r1725485 - 2.4.x patch: trunk works - http://home.apache.org/~jim/patches/aplogno-2.4.patch - +1: jim, rjung, rpluem - *) mod_heartmonitor: No need to search twice for the same value + fix some style trunk patch: http://svn.apache.org/r1727842 2.4.x patch: trunk works Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c (original) +++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c Thu Feb 18 15:07:06 2016 @@ -1796,8 +1796,8 @@ static int authnz_ldap_post_config(apr_p { if (!util_ldap_ssl_supported(s)) { - ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, - "LDAP: SSL connections (ldaps://) not supported by utilLDAP"); + ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, APLOGNO(03159) + "LDAP: SSL connections (ldaps://) not supported by utilLDAP"); return(!OK); } } Modified: httpd/httpd/branches/2.4.x/modules/arch/unix/mod_privileges.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/arch/unix/mod_privileges.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/arch/unix/mod_privileges.c (original) +++ httpd/httpd/branches/2.4.x/modules/arch/unix/mod_privileges.c Thu Feb 18 15:07:06 2016 @@ -34,8 +34,8 @@ apr_strerror(errno, msgbuf, sizeof(msgbuf)); \ return apr_pstrdup(cmd->pool, msgbuf); \ } -#define CR_CHECK(x) if (x == -1) \ - ap_log_error(APLOG_MARK, APLOG_CRIT, errno, 0, \ +#define CR_CHECK(x, y) if (x == -1) \ + ap_log_error(APLOG_MARK, APLOG_CRIT, errno, 0, y \ "Failed to initialise privileges") module AP_MODULE_DECLARE_DATA privileges_module; @@ -87,17 +87,17 @@ static void *privileges_create_cfg(apr_p /* By default, run in secure vhost mode. * That means dropping basic privileges we don't usually need. */ - CR_CHECK(priv_delset(cfg->priv, PRIV_FILE_LINK_ANY)); - CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_INFO)); - CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_SESSION)); + CR_CHECK(priv_delset(cfg->priv, PRIV_FILE_LINK_ANY), APLOGNO(03160)); + CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_INFO), APLOGNO(03161)); + CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_SESSION), APLOGNO(03162)); /* Hmmm, should CGI default to secure too ? */ /* - CR_CHECK(priv_delset(cfg->child_priv, PRIV_FILE_LINK_ANY)); - CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_INFO)); - CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_SESSION)); - CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_FORK)); - CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_EXEC)); + CR_CHECK(priv_delset(cfg->child_priv, PRIV_FILE_LINK_ANY), APLOGNO(03163)); + CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_INFO), APLOGNO(03164)); + CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_SESSION), APLOGNO(03165)); + CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_FORK), APLOGNO(03166)); + CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_EXEC), APLOGNO(03167)); */ /* we´ll use 0 for unset */ @@ -362,16 +362,16 @@ static int privileges_postconf(apr_pool_ if (dtrace_enabled) { for (sp = s; sp != NULL; sp = sp->next) { cfg = ap_get_module_config(sp->module_config, &privileges_module); - CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_KERNEL)); - CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_PROC)); - CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_USER)); - CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_KERNEL)); - CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_PROC)); - CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_USER)); - } - CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_KERNEL)); - CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_PROC)); - CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_USER)); + CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_KERNEL), APLOGNO(03168)); + CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_PROC), APLOGNO(03169)); + CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_USER), APLOGNO(03170)); + CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_KERNEL), APLOGNO(03171)); + CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_PROC), APLOGNO(03172)); + CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_USER), APLOGNO(03173)); + } + CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_KERNEL), APLOGNO(03174)); + CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_PROC), APLOGNO(03175)); + CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_USER), APLOGNO(03176)); } /* set up priv_setid for per-request use */ Modified: httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c (original) +++ httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c Thu Feb 18 15:07:06 2016 @@ -933,8 +933,8 @@ static int APR_THREAD_FUNC regfnServerSu rv = ap_pass_brigade(cid->r->output_filters, bb); cid->response_sent = 1; if (rv != APR_SUCCESS) - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, - "ServerSupport function " + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03177) + "ServerSupportFunction " "HSE_REQ_SEND_RESPONSE_HEADER " "ap_pass_brigade failed: %s", r->filename); return (rv == APR_SUCCESS); @@ -1135,8 +1135,8 @@ static int APR_THREAD_FUNC regfnServerSu rv = ap_pass_brigade(r->output_filters, bb); cid->response_sent = 1; if (rv != APR_SUCCESS) - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, - "ServerSupport function " + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03178) + "ServerSupportFunction " "HSE_REQ_TRANSMIT_FILE " "ap_pass_brigade failed: %s", r->filename); @@ -1348,8 +1348,8 @@ static int APR_THREAD_FUNC regfnServerSu rv = ap_pass_brigade(cid->r->output_filters, bb); cid->response_sent = 1; if (rv != APR_SUCCESS) - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, - "ServerSupport function " + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03179) + "ServerSupportFunction " "HSE_REQ_SEND_RESPONSE_HEADER_EX " "ap_pass_brigade failed: %s", r->filename); return (rv == APR_SUCCESS); Modified: httpd/httpd/branches/2.4.x/modules/arch/win32/mod_win32.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/arch/win32/mod_win32.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/arch/win32/mod_win32.c (original) +++ httpd/httpd/branches/2.4.x/modules/arch/win32/mod_win32.c Thu Feb 18 15:07:06 2016 @@ -423,8 +423,8 @@ static apr_status_t ap_cgi_build_command } else { ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server, - strict ? "No ExecCGI verb found for files of type '%s'." - : "No ExecCGI or Open verb found for files of type '%s'.", + strict ? APLOGNO(03180) "No ExecCGI verb found for files of type '%s'." + : APLOGNO(03181) "No ExecCGI or Open verb found for files of type '%s'.", ext); } } Modified: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (original) +++ httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c Thu Feb 18 15:07:06 2016 @@ -155,7 +155,7 @@ static void qs_to_table(const char *inpu ap_unescape_url(value); apr_table_set(parms, key, value); /* - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03182) "Found query arg: %s = %s", key, value); */ key = apr_strtok(NULL, "&", &strtok_state); Modified: httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c (original) +++ httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c Thu Feb 18 15:07:06 2016 @@ -558,6 +558,7 @@ static void dav_log_err(request_rec *r, if (errscan->desc == NULL) continue; + /* Intentional no APLOGNO */ ap_log_rerror(APLOG_MARK, level, errscan->aprerr, r, "%s [%d, #%d]", errscan->desc, errscan->status, errscan->error_id); } Modified: httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c (original) +++ httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c Thu Feb 18 15:07:06 2016 @@ -284,7 +284,7 @@ static int exipc_handler(request_rec *r) * and returned BUSY. So, bump the time and try again */ timecamped += CAMPOUT; - ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server, APLOGNO(03187) "Child %ld camping out on mutex for %" APR_INT64_T_FMT " microseconds", (long int) getpid(), timecamped); Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_include.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_include.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/filters/mod_include.c (original) +++ httpd/httpd/branches/2.4.x/modules/filters/mod_include.c Thu Feb 18 15:07:06 2016 @@ -1167,7 +1167,7 @@ static int parse_expr(include_ctx_t *ctx parse_node_t *new, *root = NULL, *current = NULL; request_rec *r = ctx->r; request_rec *rr = NULL; - const char *error = "Invalid expression \"%s\" in file %s"; + const char *error = APLOGNO(03188) "Invalid expression \"%s\" in file %s"; const char *parse = expr; unsigned regex = 0; @@ -1208,6 +1208,8 @@ static int parse_expr(include_ctx_t *ctx continue; default: + /* Intentional no APLOGNO */ + /* error text provides APLOGNO */ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, error, expr, r->filename); *was_error = 1; @@ -1333,7 +1335,7 @@ static int parse_expr(include_ctx_t *ctx continue; } - error = "Unmatched ')' in \"%s\" in file %s"; + error = APLOGNO(03189) "Unmatched ')' in \"%s\" in file %s"; break; case TOKEN_NOT: @@ -1358,6 +1360,8 @@ static int parse_expr(include_ctx_t *ctx break; } + /* Intentional no APLOGNO */ + /* error text provides APLOGNO */ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, error, expr, r->filename); *was_error = 1; return 0; @@ -1554,18 +1558,20 @@ static int parse_expr(include_ctx_t *ctx case TOKEN_RE: if (!error) { - error = "No operator before regex in expr \"%s\" in file %s"; + error = APLOGNO(03190) "No operator before regex in expr \"%s\" in file %s"; } case TOKEN_LBRACE: if (!error) { - error = "Unmatched '(' in \"%s\" in file %s"; + error = APLOGNO(03191) "Unmatched '(' in \"%s\" in file %s"; } default: if (!error) { - error = "internal parser error in \"%s\" in file %s"; + error = APLOGNO(03192) "internal parser error in \"%s\" in file %s"; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, error, expr,r->filename); + /* Intentional no APLOGNO */ + /* error text provides APLOGNO */ + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, error, expr, r->filename); *was_error = 1; return 0; } @@ -1719,6 +1725,8 @@ static int find_file(request_rec *r, con if (error_fmt) { ret = -1; + /* Intentional no APLOGNO */ + /* error_fmt provides APLOGNO */ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, error_fmt, to_send, r->filename); } @@ -1863,6 +1871,8 @@ static apr_status_t handle_include(inclu } if (error_fmt) { + /* Intentional no APLOGNO */ + /* error text is also sent to client */ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, error_fmt, tag_val, r->filename, status ? status : rr ? rr->status : 0); if (last_error) { Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c (original) +++ httpd/httpd/branches/2.4.x/modules/filters/mod_ratelimit.c Thu Feb 18 15:07:06 2016 @@ -48,7 +48,7 @@ static void brigade_dump(request_rec *r, for (e = APR_BRIGADE_FIRST(bb); e != APR_BRIGADE_SENTINEL(bb); e = APR_BUCKET_NEXT(e), i++) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(03193) "brigade: [%d] %s", i, e->type->name); } Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c (original) +++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c Thu Feb 18 15:07:06 2016 @@ -169,6 +169,8 @@ static int log_scripterror(request_rec * char time_str[APR_CTIME_LEN]; int log_flags = rv ? APLOG_ERR : APLOG_ERR; + /* Intentional no APLOGNO */ + /* Callee provides APLOGNO in error text */ ap_log_rerror(APLOG_MARK, log_flags, rv, r, "%s%s: %s", logno ? logno : "", error, r->filename); @@ -458,6 +460,7 @@ static apr_status_t run_cgi_child(apr_fi if (rc != APR_SUCCESS) { /* Bad things happened. Everyone should have cleaned up. */ + /* Intentional no APLOGNO */ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r, "couldn't create child process: %d: %s", rc, apr_filepath_name_get(r->filename)); @@ -797,7 +800,7 @@ static int cgi_handler(request_rec *r) /* if (!ap_suexec_enabled) { if (!ap_can_exec(&r->finfo)) - return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, + return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, APLOGNO(03194) "file permissions deny server execution"); } @@ -1168,8 +1171,8 @@ static apr_status_t handle_exec(include_ ap_log_rerror(APLOG_MARK, (ctx->flags & SSI_FLAG_PRINTING) ? APLOG_ERR : APLOG_WARNING, - 0, r, "missing argument for exec element in %s", - r->filename); + 0, r, APLOGNO(03195) + "missing argument for exec element in %s", r->filename); } if (!(ctx->flags & SSI_FLAG_PRINTING)) { Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c (original) +++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c Thu Feb 18 15:07:06 2016 @@ -1072,6 +1072,8 @@ static int log_scripterror(request_rec * char time_str[APR_CTIME_LEN]; int log_flags = rv ? APLOG_ERR : APLOG_ERR; + /* Intentional no APLOGNO */ + /* Callee provides APLOGNO in error text */ ap_log_rerror(APLOG_MARK, log_flags, rv, r, "%s: %s", error, r->filename); @@ -1871,8 +1873,8 @@ static apr_status_t handle_exec(include_ ap_log_rerror(APLOG_MARK, (ctx->flags & SSI_FLAG_PRINTING) ? APLOG_ERR : APLOG_WARNING, - 0, r, "missing argument for exec element in %s", - r->filename); + 0, r, APLOGNO(03196) + "missing argument for exec element in %s", r->filename); } if (!(ctx->flags & SSI_FLAG_PRINTING)) { Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_from_h1.c Thu Feb 18 15:07:06 2016 @@ -77,7 +77,7 @@ static apr_status_t make_h2_headers(h2_f from_h1->content_length = from_h1->response->content_length; from_h1->chunked = r->chunked; - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, r->connection, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, r->connection, APLOGNO(03197) "h2_from_h1(%d): converted headers, content-length: %d" ", chunked=%d", from_h1->stream_id, (int)from_h1->content_length, Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c Thu Feb 18 15:07:06 2016 @@ -300,7 +300,7 @@ apr_status_t h2_mplx_release_and_join(h2 * If we exit now, all will be deallocated and the worker, once * it does return, will walk all over freed memory... */ - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(03198) "h2_mplx(%ld): release, waiting for %d seconds now for " "all h2_workers to return, have still %d requests outstanding", m->id, i*wait_secs, (int)h2_io_set_size(m->stream_ios)); Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_push.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_push.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_push.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_push.c Thu Feb 18 15:07:06 2016 @@ -624,6 +624,7 @@ static void h2_push_diary_append(h2_push ne = move_to_last(diary, 0); *ne = *e; } + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, diary->entries->pool, "push_diary_append: %"APR_UINT64_T_HEX_FMT, ne->hash); } @@ -644,11 +645,13 @@ apr_array_header_t *h2_push_diary_update session->push_diary->dcalc(session->push_diary, &e.hash, push); idx = h2_push_diary_find(session->push_diary, e.hash); if (idx >= 0) { + /* Intentional no APLOGNO */ ap_log_cerror(APLOG_MARK, GCSLOG_LEVEL, 0, session->c, "push_diary_update: already there PUSH %s", push->req->path); move_to_last(session->push_diary, idx); } else { + /* Intentional no APLOGNO */ ap_log_cerror(APLOG_MARK, GCSLOG_LEVEL, 0, session->c, "push_diary_update: adding PUSH %s", push->req->path); if (!npushes) { @@ -788,6 +791,7 @@ static apr_status_t gset_encode_next(gse delta = pval - encoder->last; encoder->last = pval; flex_bits = (delta >> encoder->fixed_bits); + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, encoder->pool, "h2_push_diary_enc: val=%"APR_UINT64_T_HEX_FMT", delta=%" APR_UINT64_T_HEX_FMT" flex_bits=%ld, " @@ -866,6 +870,7 @@ apr_status_t h2_push_diary_digest_get(h2 encoder.bit = 8; encoder.last = 0; + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, pool, "h2_push_diary_digest_get: %d entries, N=%d, log2n=%d, " "mask_bits=%d, enc.mask_bits=%d, delta_bits=%d, enc.log2p=%d, authority=%s", @@ -888,6 +893,7 @@ apr_status_t h2_push_diary_digest_get(h2 gset_encode_next(&encoder, hashes[i]); } } + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, pool, "h2_push_diary_digest_get: golomb compressed hashes, %d bytes", (int)encoder.offset + 1); @@ -952,6 +958,7 @@ static apr_status_t gset_decode_next(gse *phash = delta + decoder->last_val; decoder->last_val = *phash; + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, decoder->pool, "h2_push_diary_digest_dec: val=%"APR_UINT64_T_HEX_FMT", delta=%" APR_UINT64_T_HEX_FMT", flex=%d, fixed=%"APR_UINT64_T_HEX_FMT, @@ -1026,6 +1033,7 @@ apr_status_t h2_push_diary_digest_set(h2 diary->N = diary->NMax; } + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, pool, "h2_push_diary_digest_set: N=%d, log2n=%d, " "diary->mask_bits=%d, dec.log2p=%d", @@ -1040,6 +1048,7 @@ apr_status_t h2_push_diary_digest_set(h2 h2_push_diary_append(diary, &e); } + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, pool, "h2_push_diary_digest_set: diary now with %d entries, mask_bits=%d", (int)diary->entries->nelts, diary->mask_bits); @@ -1051,6 +1060,7 @@ apr_status_t h2_push_diary_digest64_set( { const char *data; apr_size_t len = h2_util_base64url_decode(&data, data64url, pool); + /* Intentional no APLOGNO */ ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, pool, "h2_push_diary_digest64_set: digest=%s, dlen=%d", data64url, (int)len); Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_session.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_session.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_session.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_session.c Thu Feb 18 15:07:06 2016 @@ -732,7 +732,7 @@ static apr_status_t session_pool_cleanup * connection when sending the next request, this has the effect * that at least this one request will fail. */ - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, session->c, + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, session->c, APLOGNO(03199) "session(%ld): connection disappeared without proper " "goodbye, clients will be confused, should not happen", session->id); @@ -895,7 +895,7 @@ static h2_session *h2_session_create_int session->push_diary = h2_push_diary_create(session->pool, n); if (APLOGcdebug(c)) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(03200) "session(%ld) created, timeout=%d, keepalive_timeout=%d, " "max_streams=%d, stream_mem=%d, push_diary(type=%d,N=%d)", session->id, session->timeout_secs, session->keepalive_secs, @@ -1000,7 +1000,7 @@ static apr_status_t h2_session_start(h2_ ++slen; } - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, APLOGNO(03201) "h2_session(%ld): start, INITIAL_WINDOW_SIZE=%ld, " "MAX_CONCURRENT_STREAMS=%d", session->id, (long)win_size, (int)session->max_stream_count); @@ -1402,7 +1402,7 @@ apr_status_t h2_session_set_prio(h2_sess id_grandpa = nghttp2_stream_get_stream_id(s_grandpa); rv = nghttp2_session_change_stream_priority(session->ngh2, id_parent, &ps); if (rv < 0) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03202) "h2_stream(%ld-%d): PUSH BEFORE, weight=%d, " "depends=%d, returned=%d", session->id, id_parent, ps.weight, ps.stream_id, rv); @@ -1424,7 +1424,7 @@ apr_status_t h2_session_set_prio(h2_sess rv = nghttp2_session_change_stream_priority(session->ngh2, stream->id, &ps); - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03203) "h2_stream(%ld-%d): PUSH %s, weight=%d, " "depends=%d, returned=%d", session->id, stream->id, ptype, Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_task_output.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_task_output.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_task_output.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_task_output.c Thu Feb 18 15:07:06 2016 @@ -69,7 +69,7 @@ static apr_status_t open_if_needed(h2_ta /* This happens currently when ap_die(status, r) is invoked * by a read request filter. */ - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c, APLOGNO(03204) "h2_task_output(%s): write without response " "for %s %s %s", output->task->id, output->task->request->method, Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_util.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http2/h2_util.c (original) +++ httpd/httpd/branches/2.4.x/modules/http2/h2_util.c Thu Feb 18 15:07:06 2016 @@ -341,7 +341,7 @@ apr_status_t h2_util_move(apr_bucket_bri APR_BUCKET_REMOVE(b); APR_BRIGADE_INSERT_TAIL(to, b); #if LOG_BUCKETS - ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, + ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, APLOGNO(03205) "h2_util_move: %s, passed bucket(same bucket_alloc) " "%ld-%ld, type=%s", msg, (long)b->start, (long)b->length, @@ -379,7 +379,7 @@ apr_status_t h2_util_move(apr_bucket_bri apr_file_t *fd = f->fd; int setaside = (f->readpool != to->p); #if LOG_BUCKETS - ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, + ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, APLOGNO(03206) "h2_util_move: %s, moving FILE bucket %ld-%ld " "from=%lx(p=%lx) to=%lx(p=%lx), setaside=%d", msg, (long)b->start, (long)b->length, @@ -406,7 +406,7 @@ apr_status_t h2_util_move(apr_bucket_bri if (status == APR_SUCCESS && len > 0) { status = apr_brigade_write(to, NULL, NULL, data, len); #if LOG_BUCKETS - ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, + ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, APLOGNO(03207) "h2_util_move: %s, copied bucket %ld-%ld " "from=%lx(p=%lx) to=%lx(p=%lx)", msg, (long)b->start, (long)b->length, @@ -422,7 +422,7 @@ apr_status_t h2_util_move(apr_bucket_bri APR_BUCKET_REMOVE(b); APR_BRIGADE_INSERT_TAIL(to, b); #if LOG_BUCKETS - ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, + ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, APLOGNO(03208) "h2_util_move: %s, passed setaside bucket %ld-%ld " "from=%lx(p=%lx) to=%lx(p=%lx)", msg, (long)b->start, (long)b->length, @@ -485,7 +485,7 @@ apr_status_t h2_util_copy(apr_bucket_bri if (status == APR_SUCCESS && len > 0) { status = apr_brigade_write(to, NULL, NULL, data, len); #if LOG_BUCKETS - ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, + ap_log_perror(APLOG_MARK, LOG_LEVEL, 0, to->p, APLOGNO(03209) "h2_util_copy: %s, copied bucket %ld-%ld " "from=%lx(p=%lx) to=%lx(p=%lx)", msg, (long)b->start, (long)b->length, @@ -737,6 +737,7 @@ void h2_util_bb_log(conn_rec *c, int str } line = *buffer? buffer : "(empty)"; } + /* Intentional no APLOGNO */ ap_log_cerror(APLOG_MARK, level, 0, c, "bb_dump(%ld-%d)-%s: %s", c->id, stream_id, tag, line); Modified: httpd/httpd/branches/2.4.x/modules/lua/lua_request.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/lua_request.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/lua/lua_request.c (original) +++ httpd/httpd/branches/2.4.x/modules/lua/lua_request.c Thu Feb 18 15:07:06 2016 @@ -2317,7 +2317,7 @@ static int lua_websocket_read(lua_State return 0; } } - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03210) "Websocket: Reading %" APR_SIZE_T_FMT " (%s) bytes, masking is %s. %s", plen, (payload >= 126) ? "extra payload" : "no extra payload", Modified: httpd/httpd/branches/2.4.x/modules/lua/lua_vmprep.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/lua_vmprep.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/lua/lua_vmprep.c (original) +++ httpd/httpd/branches/2.4.x/modules/lua/lua_vmprep.c Thu Feb 18 15:07:06 2016 @@ -53,59 +53,65 @@ static void pstack_dump(lua_State *L, ap int i; int top = lua_gettop(L); - ap_log_perror(APLOG_MARK, level, 0, r, "Lua Stack Dump: [%s]", msg); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03211) + "Lua Stack Dump: [%s]", msg); for (i = 1; i <= top; i++) { int t = lua_type(L, i); switch (t) { case LUA_TSTRING:{ - ap_log_perror(APLOG_MARK, level, 0, r, + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03212) "%d: '%s'", i, lua_tostring(L, i)); break; } case LUA_TUSERDATA:{ - ap_log_perror(APLOG_MARK, level, 0, r, "%d: userdata", i); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03213) + "%d: userdata", i); break; } case LUA_TLIGHTUSERDATA:{ - ap_log_perror(APLOG_MARK, level, 0, r, "%d: lightuserdata", - i); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03214) + "%d: lightuserdata", i); break; } case LUA_TNIL:{ - ap_log_perror(APLOG_MARK, level, 0, r, "%d: NIL", i); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03215) + "%d: NIL", i); break; } case LUA_TNONE:{ - ap_log_perror(APLOG_MARK, level, 0, r, "%d: None", i); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03216) + "%d: None", i); break; } case LUA_TBOOLEAN:{ - ap_log_perror(APLOG_MARK, level, 0, r, - "%d: %s", i, lua_toboolean(L, - i) ? "true" : - "false"); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03217) + "%d: %s", + i, lua_toboolean(L, i) ? "true" : "false"); break; } case LUA_TNUMBER:{ - ap_log_perror(APLOG_MARK, level, 0, r, + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03218) "%d: %g", i, lua_tonumber(L, i)); break; } case LUA_TTABLE:{ - ap_log_perror(APLOG_MARK, level, 0, r, "%d: ", i); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03219) + "%d:
", i); break; } case LUA_TTHREAD:{ - ap_log_perror(APLOG_MARK, level, 0, r, "%d: ", i); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03220) + "%d: ", i); break; } case LUA_TFUNCTION:{ - ap_log_perror(APLOG_MARK, level, 0, r, "%d: ", i); + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03221) + "%d: ", i); break; } default:{ - ap_log_perror(APLOG_MARK, level, 0, r, + ap_log_perror(APLOG_MARK, level, 0, r, APLOGNO(03222) "%d: unknown: [%s]", i, lua_typename(L, i)); break; } Modified: httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c (original) +++ httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c Thu Feb 18 15:07:06 2016 @@ -1256,7 +1256,8 @@ static int lua_auth_checker_harness_last } static void lua_insert_filter_harness(request_rec *r) { - /* ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "LuaHookInsertFilter not yet implemented"); */ + /* ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(03223) + * "LuaHookInsertFilter not yet implemented"); */ } static int lua_log_transaction_harness(request_rec *r) Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original) +++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Thu Feb 18 15:07:06 2016 @@ -473,6 +473,7 @@ static void do_rewritelog(request_rec *r AP_REWRITE_LOG((uintptr_t)r, level, r->main ? 0 : 1, (char *)ap_get_server_name(r), logline); + /* Intentional no APLOGNO */ ap_log_rerror(APLOG_MARK, APLOG_DEBUG + level, 0, r, "%s", logline); return; Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c (original) +++ httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c Thu Feb 18 15:07:06 2016 @@ -395,8 +395,8 @@ static int check_speling(request_rec *r) ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS, r, - ref ? "Fixed spelling: %s to %s from %s" - : "Fixed spelling: %s to %s%s", + ref ? APLOGNO(03224) "Fixed spelling: %s to %s from %s" + : APLOGNO(03225) "Fixed spelling: %s to %s%s", r->uri, nuri, (ref ? ref : "")); @@ -504,8 +504,8 @@ static int check_speling(request_rec *r) apr_pool_destroy(sub_pool); ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, - ref ? "Spelling fix: %s: %d candidates from %s" - : "Spelling fix: %s: %d candidates%s", + ref ? APLOGNO(03226) "Spelling fix: %s: %d candidates from %s" + : APLOGNO(03227) "Spelling fix: %s: %d candidates%s", r->uri, candidates->nelts, (ref ? ref : "")); Modified: httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c (original) +++ httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c Thu Feb 18 15:07:06 2016 @@ -297,7 +297,7 @@ static apr_status_t ajp_marshal_into_msg if (s->secret) { if (ajp_msg_append_uint8(msg, SC_A_SECRET) || ajp_msg_append_string(msg, s->secret)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(03228) "Error ajp_marshal_into_msgb - " "Error appending secret"); return APR_EGENERAL; Modified: httpd/httpd/branches/2.4.x/modules/proxy/ajp_msg.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/ajp_msg.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/proxy/ajp_msg.c (original) +++ httpd/httpd/branches/2.4.x/modules/proxy/ajp_msg.c Thu Feb 18 15:07:06 2016 @@ -130,9 +130,11 @@ apr_status_t ajp_msg_log(request_rec *r, if (rc == APR_SUCCESS) { while ((next = ap_strchr(buf, '\n'))) { *next = '\0'; + /* Intentional no APLOGNO */ ap_log_rerror(APLOG_MARK, level, 0, r, "%s", buf); buf = next + 1; } + /* Intentional no APLOGNO */ ap_log_rerror(APLOG_MARK, level, 0, r, "%s", buf); } } @@ -241,7 +243,7 @@ apr_status_t ajp_msg_end(ajp_msg_t *msg) static APR_INLINE int ajp_log_overflow(ajp_msg_t *msg, const char *context) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, APLOGNO(03229) "%s(): BufferOverflowException %" APR_SIZE_T_FMT " %" APR_SIZE_T_FMT, context, msg->pos, msg->len); Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original) +++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c Thu Feb 18 15:07:06 2016 @@ -82,7 +82,7 @@ argstr_to_table(apr_pool_t *p, char *str ap_unescape_url(value); apr_table_set(parms, key, value); /* - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03230) "Found query arg: %s = %s", key, value); */ key = apr_strtok(NULL, "&", &strtok_state); Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c (original) +++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c Thu Feb 18 15:07:06 2016 @@ -1059,7 +1059,7 @@ static int proxy_handler(request_rec *r) } #if DEBUGGING ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, - (direct_connect) ? "NoProxy for %s" : "UseProxy for %s", + (direct_connect) ? APLOGNO(03231) "NoProxy for %s" : APLOGNO(03232) "UseProxy for %s", r->uri); #endif Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c (original) +++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c Thu Feb 18 15:07:06 2016 @@ -391,7 +391,7 @@ static int ftp_getrc_msg(conn_rec *ftp_c return -1; } /* - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, APLOGNO(03233) "<%s", response); */ if (!apr_isdigit(response[0]) || !apr_isdigit(response[1]) || Modified: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c (original) +++ httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c Thu Feb 18 15:07:06 2016 @@ -653,7 +653,7 @@ PROXY_DECLARE(int) ap_proxy_is_domainnam #if 0 if (addr[i] == ':') { - ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, APLOGNO(03234) "@@@@ handle optional port in proxy_is_domainname()"); /* @@@@ handle optional port */ } Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c (original) +++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c Thu Feb 18 15:07:06 2016 @@ -1019,6 +1019,8 @@ static void ssl_filter_io_shutdown(ssl_f /* and finally log the fact that we've closed the connection */ if (APLOG_CS_IS_LEVEL(c, mySrvFromConn(c), loglevel)) { + /* Intentional no APLOGNO */ + /* logno provides APLOGNO */ ap_log_cserror(APLOG_MARK, loglevel, 0, c, mySrvFromConn(c), "%sConnection closed to child %ld with %s shutdown " "(server %s)", Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c (original) +++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c Thu Feb 18 15:07:06 2016 @@ -233,7 +233,7 @@ static int verify_ocsp_status(X509 *cert status == V_OCSP_CERTSTATUS_GOOD ? "good" : (status == V_OCSP_CERTSTATUS_REVOKED ? "revoked" : "unknown"); - ssl_log_cxerror(SSLLOG_MARK, level, 0, c, cert, + ssl_log_cxerror(SSLLOG_MARK, level, 0, c, cert, APLOGNO(03239) "OCSP validation completed, " "certificate status: %s (%d, %d)", result, status, reason); Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c (original) +++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c Thu Feb 18 15:07:06 2016 @@ -776,20 +776,20 @@ static int stapling_cb(SSL *ssl, void *a rv = get_and_check_cached_response(s, mctx, &rsp, &ok, cinf, conn->pool); if (rv != 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03236) "stapling_cb: error checking for cached response " "after obtaining refresh mutex"); stapling_refresh_mutex_off(s); return rv; } else if (rsp) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03237) "stapling_cb: don't need to refresh cached response " "after obtaining refresh mutex"); stapling_refresh_mutex_off(s); } else { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03238) "stapling_cb: still must refresh cached response " "after obtaining refresh mutex"); rv = stapling_renew_response(s, mctx, ssl, cinf, &rsp, &ok, Modified: httpd/httpd/branches/2.4.x/server/util_script.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_script.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/server/util_script.c (original) +++ httpd/httpd/branches/2.4.x/server/util_script.c Thu Feb 18 15:07:06 2016 @@ -469,12 +469,14 @@ AP_DECLARE(int) ap_scan_script_header_er const char *msg = "Premature end of script headers"; if (first_header) msg = "End of script output before headers"; + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "%s: %s", msg, apr_filepath_name_get(r->filename)); return HTTP_INTERNAL_SERVER_ERROR; } else if (rv == -1) { + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "Script timed out before returning headers: %s", apr_filepath_name_get(r->filename)); @@ -582,6 +584,7 @@ AP_DECLARE(int) ap_scan_script_header_er } } + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "malformed header from script '%s': Bad header: %.30s", apr_filepath_name_get(r->filename), w); @@ -614,6 +617,7 @@ AP_DECLARE(int) ap_scan_script_header_er else if (!strcasecmp(w, "Status")) { r->status = cgi_status = atoi(l); if (!ap_is_HTTP_VALID_RESPONSE(cgi_status)) + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "Invalid status line from script '%s': %.30s", apr_filepath_name_get(r->filename), l); Modified: httpd/httpd/branches/2.4.x/server/vhost.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/vhost.c?rev=1731085&r1=1731084&r2=1731085&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/server/vhost.c (original) +++ httpd/httpd/branches/2.4.x/server/vhost.c Thu Feb 18 15:07:06 2016 @@ -298,7 +298,7 @@ static void dump_iphash_statistics(serve } qsort(count, IPHASH_TABLE_SIZE, sizeof(count[0]), iphash_compare); p = buf + apr_snprintf(buf, sizeof(buf), - "iphash: total hashed = %u, avg chain = %u, " + APLOGNO(03235) "iphash: total hashed = %u, avg chain = %u, " "chain lengths (count x len):", total, total / IPHASH_TABLE_SIZE); total = 1; @@ -314,6 +314,8 @@ static void dump_iphash_statistics(serve } p += apr_snprintf(p, sizeof(buf) - (p - buf), " %ux%u", total, count[IPHASH_TABLE_SIZE - 1]); + /* Intentional no APLOGNO */ + /* buf provides APLOGNO */ ap_log_error(APLOG_MARK, APLOG_DEBUG, main_s, buf); } #endif