You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/02/02 17:13:20 UTC
svn commit: r1239695 - in /subversion/branches/1.7.x: ./ STATUS build.conf
contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/
Author: danielsh
Date: Thu Feb 2 16:13:20 2012
New Revision: 1239695
URL: http://svn.apache.org/viewvc?rev=1239695&view=rev
Log:
Merge the r1207555 group from trunk:
* r1207555, r1207808
mod_dontdothat: contrib/ -> tools/ and relicense under ALv2.
Justification:
ASF infra is using this so we should maintain it.
Stuff in contrib/ isn't officially maintained.
Notes:
r1207555: Perform the move (from r1207550) and relicense
r1207808: Enable building mod_dontdothat from our standard make scripts.
Votes:
+1: rhuijben, stsp, cmpilato
Added:
subversion/branches/1.7.x/tools/server-side/mod_dontdothat/ (props changed)
- copied from r1207555, subversion/trunk/tools/server-side/mod_dontdothat/
Removed:
subversion/branches/1.7.x/contrib/server-side/mod_dontdothat/
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build.conf
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 2 16:13:20 2012
@@ -74,4 +74,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,115
6085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,
1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207656,1207663,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,12207
42,1220750,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,115
6085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,
1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-12153
75,1215379,1220742,1220750,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1235264,1235296,1235302,1235736,1236163,1236283,1236343
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1239695&r1=1239694&r2=1239695&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Feb 2 16:13:20 2012
@@ -127,17 +127,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1207555, r1207808
- mod_dontdothat: contrib/ -> tools/ and relicense under ALv2.
- Justification:
- ASF infra is using this so we should maintain it.
- Stuff in contrib/ isn't officially maintained.
- Notes:
- r1207555: Perform the move (from r1207550) and relicense
- r1207808: Enable building mod_dontdothat from our standard make scripts.
- Votes:
- +1: rhuijben, stsp, cmpilato
-
* r1221178, r1221303
Fix issue 4086, mod_dav_svn's handling of POST errors.
Justification:
Modified: subversion/branches/1.7.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build.conf?rev=1239695&r1=1239694&r2=1239695&view=diff
==============================================================================
--- subversion/branches/1.7.x/build.conf (original)
+++ subversion/branches/1.7.x/build.conf Thu Feb 2 16:13:20 2012
@@ -361,6 +361,15 @@ libs = libsvn_repos libsvn_subr
install = apache-mod
msvc-libs = libhttpd.lib
+[mod_dontdothat]
+description = Apache Httpd module to block certain kinds of Apache Subversion requests
+type = apache-mod
+path = tools/server-side/mod_dontdothat
+nonlibs = mod_dav_svn apr aprutil
+libs = libsvn_subr
+install = apache-mod
+msvc-libs = libhttpd.lib
+
# ----------------------------------------------------------------------------
#
# CONSTRUCTED HEADERS
@@ -1104,7 +1113,7 @@ type = project
path = build/win32
libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync
svnversion
- mod_authz_svn mod_dav_svn
+ mod_authz_svn mod_dav_svn mod_dontdothat
svnauthz-validate svnraisetreeconflict
[__ALL_TESTS__]
Propchange: subversion/branches/1.7.x/tools/server-side/mod_dontdothat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 2 16:13:20 2012
@@ -0,0 +1,2 @@
+*.slo
+.libs
Re: svn commit: r1239695 - in /subversion/branches/1.7.x: ./ STATUS
build.conf contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Feb 2, 2012 at 6:10 PM, Bert Huijben <be...@qqmail.nl> wrote:
>
>
>> -----Original Message-----
>> From: Johan Corveleyn [mailto:jcorvel@gmail.com]
>> Sent: donderdag 2 februari 2012 14:36
>> To: Stephen Butler
>> Cc: dev@subversion.apache.org; rhuijben@apache.org; Stefan Sperling; C.
>> Michael Pilato
>> Subject: Re: svn commit: r1239695 - in /subversion/branches/1.7.x: ./
> STATUS
>> build.conf contrib/server-side/mod_dontdothat/ tools/server-
>> side/mod_dontdothat/
>
>> Thanks for confirming. I just proposed r1227900 for backport.
>
> I don't have this problem in my build, but you can add my +1 for
> backporting.
I also could build mod_dontdothat on 1.7 without r1227900. Bert,
IIRC, like me, you build with static libraries (--disable-shared). I
tried to build with shared libs and the build failed. Johan, I assume
you are building with shared libs?
P.S. I gave r1227900 the third vote in STATUS.
Paul
> Bert
>
RE: svn commit: r1239695 - in /subversion/branches/1.7.x: ./ STATUS build.conf contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Johan Corveleyn [mailto:jcorvel@gmail.com]
> Sent: donderdag 2 februari 2012 14:36
> To: Stephen Butler
> Cc: dev@subversion.apache.org; rhuijben@apache.org; Stefan Sperling; C.
> Michael Pilato
> Subject: Re: svn commit: r1239695 - in /subversion/branches/1.7.x: ./
STATUS
> build.conf contrib/server-side/mod_dontdothat/ tools/server-
> side/mod_dontdothat/
> Thanks for confirming. I just proposed r1227900 for backport.
I don't have this problem in my build, but you can add my +1 for
backporting.
Bert
Re: svn commit: r1239695 - in /subversion/branches/1.7.x: ./ STATUS
build.conf contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/
Posted by Johan Corveleyn <jc...@gmail.com>.
On Thu, Feb 2, 2012 at 11:22 PM, Stephen Butler <sb...@elego.de> wrote:
>
> On Feb 2, 2012, at 23:18 , Johan Corveleyn wrote:
>
>> On Thu, Feb 2, 2012 at 5:13 PM, <da...@apache.org> wrote:
>>> Author: danielsh
>>> Date: Thu Feb 2 16:13:20 2012
>>> New Revision: 1239695
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1239695&view=rev
>>> Log:
>>> Merge the r1207555 group from trunk:
>>>
>>> * r1207555, r1207808
>>> mod_dontdothat: contrib/ -> tools/ and relicense under ALv2.
>>> Justification:
>>> ASF infra is using this so we should maintain it.
>>> Stuff in contrib/ isn't officially maintained.
>>> Notes:
>>> r1207555: Perform the move (from r1207550) and relicense
>>> r1207808: Enable building mod_dontdothat from our standard make scripts.
>>> Votes:
>>> +1: rhuijben, stsp, cmpilato
>>
>> This just reminded me of a build problem I had with trunk with
>> mod_dontdothat. Which I fixed in r1227900 [1]. I just checked, and now
>> I see the same problem when building the 1.7.x branch:
>>
>> [[[
>> mod_dontdothat.obj : error LNK2019: unresolved external symbol
>> _XML_Parse referenced in function _dontdothat_filter
>> mod_dontdothat.obj : error LNK2019: unresolved external symbol
>> _XML_ParserFree referenced in function _clean_up_parser
>> mod_dontdothat.obj : error LNK2019: unresolved external symbol
>> _XML_SetCharacterDataHandler referenced in function
>> _dontdothat_insert_filters
>> mod_dontdothat.obj : error LNK2019: unresolved external symbol
>> _XML_SetElementHandler referenced in function
>> _dontdothat_insert_filters
>> mod_dontdothat.obj : error LNK2019: unresolved external symbol
>> _XML_SetUserData referenced in function _dontdothat_insert_filters
>> mod_dontdothat.obj : error LNK2019: unresolved external symbol
>> _XML_ParserCreate referenced in function _dontdothat_insert_filters
>> ..\..\..\Release\tools\server-side\mod_dontdothat\mod_dontdothat.so :
>> fatal error LNK1120: 6 unresolved externals
>> ]]]
>>
>> Am I the only one seeing this? Either this is a local problem, only
>> for me (in which case, maybe it should be reverted from trunk and I
>> should fix my environment or the Makefile I'm using or something),
>
>
> I saw it on 1.7.x too, about an hour ago (Windows 7, VS2008). I
> thought it was my own fault.
>
>>
>> or others should be affected too, in which case r1227900 should be
>> backported too.
>
> +1
Thanks for confirming. I just proposed r1227900 for backport.
--
Johan
Re: svn commit: r1239695 - in /subversion/branches/1.7.x: ./ STATUS build.conf contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/
Posted by Stephen Butler <sb...@elego.de>.
On Feb 2, 2012, at 23:18 , Johan Corveleyn wrote:
> On Thu, Feb 2, 2012 at 5:13 PM, <da...@apache.org> wrote:
>> Author: danielsh
>> Date: Thu Feb 2 16:13:20 2012
>> New Revision: 1239695
>>
>> URL: http://svn.apache.org/viewvc?rev=1239695&view=rev
>> Log:
>> Merge the r1207555 group from trunk:
>>
>> * r1207555, r1207808
>> mod_dontdothat: contrib/ -> tools/ and relicense under ALv2.
>> Justification:
>> ASF infra is using this so we should maintain it.
>> Stuff in contrib/ isn't officially maintained.
>> Notes:
>> r1207555: Perform the move (from r1207550) and relicense
>> r1207808: Enable building mod_dontdothat from our standard make scripts.
>> Votes:
>> +1: rhuijben, stsp, cmpilato
>
> This just reminded me of a build problem I had with trunk with
> mod_dontdothat. Which I fixed in r1227900 [1]. I just checked, and now
> I see the same problem when building the 1.7.x branch:
>
> [[[
> mod_dontdothat.obj : error LNK2019: unresolved external symbol
> _XML_Parse referenced in function _dontdothat_filter
> mod_dontdothat.obj : error LNK2019: unresolved external symbol
> _XML_ParserFree referenced in function _clean_up_parser
> mod_dontdothat.obj : error LNK2019: unresolved external symbol
> _XML_SetCharacterDataHandler referenced in function
> _dontdothat_insert_filters
> mod_dontdothat.obj : error LNK2019: unresolved external symbol
> _XML_SetElementHandler referenced in function
> _dontdothat_insert_filters
> mod_dontdothat.obj : error LNK2019: unresolved external symbol
> _XML_SetUserData referenced in function _dontdothat_insert_filters
> mod_dontdothat.obj : error LNK2019: unresolved external symbol
> _XML_ParserCreate referenced in function _dontdothat_insert_filters
> ..\..\..\Release\tools\server-side\mod_dontdothat\mod_dontdothat.so :
> fatal error LNK1120: 6 unresolved externals
> ]]]
>
> Am I the only one seeing this? Either this is a local problem, only
> for me (in which case, maybe it should be reverted from trunk and I
> should fix my environment or the Makefile I'm using or something),
I saw it on 1.7.x too, about an hour ago (Windows 7, VS2008). I
thought it was my own fault.
>
> or others should be affected too, in which case r1227900 should be
> backported too.
+1
Steve
>
>
> [1] http://svn.apache.org/viewvc?view=revision&revision=1227900
>
> --
> Johan
Re: svn commit: r1239695 - in /subversion/branches/1.7.x: ./ STATUS
build.conf contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/
Posted by Johan Corveleyn <jc...@gmail.com>.
On Thu, Feb 2, 2012 at 5:13 PM, <da...@apache.org> wrote:
> Author: danielsh
> Date: Thu Feb 2 16:13:20 2012
> New Revision: 1239695
>
> URL: http://svn.apache.org/viewvc?rev=1239695&view=rev
> Log:
> Merge the r1207555 group from trunk:
>
> * r1207555, r1207808
> mod_dontdothat: contrib/ -> tools/ and relicense under ALv2.
> Justification:
> ASF infra is using this so we should maintain it.
> Stuff in contrib/ isn't officially maintained.
> Notes:
> r1207555: Perform the move (from r1207550) and relicense
> r1207808: Enable building mod_dontdothat from our standard make scripts.
> Votes:
> +1: rhuijben, stsp, cmpilato
This just reminded me of a build problem I had with trunk with
mod_dontdothat. Which I fixed in r1227900 [1]. I just checked, and now
I see the same problem when building the 1.7.x branch:
[[[
mod_dontdothat.obj : error LNK2019: unresolved external symbol
_XML_Parse referenced in function _dontdothat_filter
mod_dontdothat.obj : error LNK2019: unresolved external symbol
_XML_ParserFree referenced in function _clean_up_parser
mod_dontdothat.obj : error LNK2019: unresolved external symbol
_XML_SetCharacterDataHandler referenced in function
_dontdothat_insert_filters
mod_dontdothat.obj : error LNK2019: unresolved external symbol
_XML_SetElementHandler referenced in function
_dontdothat_insert_filters
mod_dontdothat.obj : error LNK2019: unresolved external symbol
_XML_SetUserData referenced in function _dontdothat_insert_filters
mod_dontdothat.obj : error LNK2019: unresolved external symbol
_XML_ParserCreate referenced in function _dontdothat_insert_filters
..\..\..\Release\tools\server-side\mod_dontdothat\mod_dontdothat.so :
fatal error LNK1120: 6 unresolved externals
]]]
Am I the only one seeing this? Either this is a local problem, only
for me (in which case, maybe it should be reverted from trunk and I
should fix my environment or the Makefile I'm using or something), or
others should be affected too, in which case r1227900 should be
backported too.
[1] http://svn.apache.org/viewvc?view=revision&revision=1227900
--
Johan