You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Branko Čibej <br...@xbc.nu> on 2005/02/23 02:07:15 UTC
[PATCH] Fix mod_dav exports on Windows
A number of public functions in mod_dav.h aren't properly exported with
DAV_DECLARE. This recently became a problem for Subversion, because
mod_dav_svn now supports DAV locking, and mod_dav's locking functions
were amongst the ones that were not exported. Nobody noticed this on
Unix where DAV_DECLARE is a no-op, but Windows suffered mightily.
The attached patch (against the 2.0.x branch) fixes the problem. I had
to use DAV_DECLARE_NONSTD in a few places where the functions are used
as callbacks, because I didn't want to fiddle with the __stdcall horror
in callback parameter declarations.
Subversion 1.2, which will introduce locking functionality, will not
work as a DAV server on Windows without an httpd-2.0.x release that
includes this patch. I hope such a thing is possible in the next few
months, and I'm only sorry I was too late for the the 2.0.53 release.
[[[
Correctly export all mod_dav public functions.
* modules/dav/main/mod_dav.h: Wrap all public functions in
DAV_DECLARE or DAV_DECLARE_NONSTD.
* modules/dav/main/liveprop.c, modules/dav/main/props.c,
modules/dav/main/util_lock.c, modules/dav/main/mod_dav.c,
modules/dav/main/std_liveprop.c, modules/dav/main/util.c:
Update function definitions.
]]]
-- Brane
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Branko Čibej <br...@xbc.nu>.
Justin Erenkrantz wrote:
> --On Friday, February 25, 2005 10:35 PM +0100 "Branko ?ibej"
> <br...@xbc.nu> wrote:
>
>> Ah! I'm afraid you seem to have failed. trying, anyway. This would
>> probably
>> work:
>>
>> env LANG=en_US.UTF-8 svn propedit --revprop -r??? svn:log
>> https://svn.apache.org/repos/asf/httpd/httpd
>>
>> then paste in the name from Subversion's COMMITTERS file.
>
>
> That's exactly what I did with a UTF-8 editor (bbedit). I couldn't
> even commit unless I set the LANG variable. I'm fairly sure that the
> CHANGES entry
(you mean, COMMITTERS)
> is wrong though.
No, it's right. Point a browser at it, and you'll see :)
> Hmm. I just worked with Karl on trying to get it right as I wasn't
> even sure what the right character was. But, there's still something
> wonky going on.
It's not all that important anyway. Just put a "C" there.
-- Brane
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Branko Čibej <br...@xbc.nu>.
Justin Erenkrantz wrote:
> --On Friday, February 25, 2005 10:35 PM +0100 "Branko ?ibej"
> <br...@xbc.nu> wrote:
>
>> Ah! I'm afraid you seem to have failed. trying, anyway. This would
>> probably
>> work:
>>
>> env LANG=en_US.UTF-8 svn propedit --revprop -r??? svn:log
>> https://svn.apache.org/repos/asf/httpd/httpd
>>
>> then paste in the name from Subversion's COMMITTERS file.
>
>
> That's exactly what I did with a UTF-8 editor (bbedit). I couldn't
> even commit unless I set the LANG variable. I'm fairly sure that the
> CHANGES entry
(you mean, COMMITTERS)
> is wrong though.
No, it's right. Point a browser at it, and you'll see :)
> Hmm. I just worked with Karl on trying to get it right as I wasn't
> even sure what the right character was. But, there's still something
> wonky going on.
It's not all that important anyway. Just put a "C" there.
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Friday, February 25, 2005 10:35 PM +0100 "Branko ?ibej" <br...@xbc.nu>
wrote:
> Ah! I'm afraid you seem to have failed. trying, anyway. This would probably
> work:
>
> env LANG=en_US.UTF-8 svn propedit --revprop -r??? svn:log
> https://svn.apache.org/repos/asf/httpd/httpd
>
> then paste in the name from Subversion's COMMITTERS file.
That's exactly what I did with a UTF-8 editor (bbedit). I couldn't even
commit unless I set the LANG variable. I'm fairly sure that the CHANGES entry
is wrong though.
Hmm. I just worked with Karl on trying to get it right as I wasn't even sure
what the right character was. But, there's still something wonky going on.
Anyhow, I've got a plane to catch... We'll get it right... -- justin
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Friday, February 25, 2005 10:35 PM +0100 "Branko ?ibej" <br...@xbc.nu>
wrote:
> Ah! I'm afraid you seem to have failed. trying, anyway. This would probably
> work:
>
> env LANG=en_US.UTF-8 svn propedit --revprop -r??? svn:log
> https://svn.apache.org/repos/asf/httpd/httpd
>
> then paste in the name from Subversion's COMMITTERS file.
That's exactly what I did with a UTF-8 editor (bbedit). I couldn't even
commit unless I set the LANG variable. I'm fairly sure that the CHANGES entry
is wrong though.
Hmm. I just worked with Karl on trying to get it right as I wasn't even sure
what the right character was. But, there's still something wonky going on.
Anyhow, I've got a plane to catch... We'll get it right... -- justin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Branko Čibej <br...@xbc.nu>.
Justin Erenkrantz wrote:
> --On Wednesday, February 23, 2005 3:07 AM +0100 "Branko ?ibej"
> <br...@xbc.nu> wrote:
>
>> A number of public functions in mod_dav.h aren't properly exported with
>> DAV_DECLARE. This recently became a problem for Subversion, because
>> mod_dav_svn now supports DAV locking, and mod_dav's locking functions
>> were
>> amongst the ones that were not exported. Nobody noticed this on Unix
>> where
>> DAV_DECLARE is a no-op, but Windows suffered mightily.
>>
>> The attached patch (against the 2.0.x branch) fixes the problem. I
>> had to
>> use DAV_DECLARE_NONSTD in a few places where the functions are used as
>> callbacks, because I didn't want to fiddle with the __stdcall horror in
>> callback parameter declarations.
>>
>> Subversion 1.2, which will introduce locking functionality, will not
>> work as
>> a DAV server on Windows without an httpd-2.0.x release that includes
>> this
>> patch. I hope such a thing is possible in the next few months, and
>> I'm only
>> sorry I was too late for the the 2.0.53 release.
>
>
> I've committed it to trunk and have proposed it for backport. -- justin
Thanks! Sorry I didn't provide a patch for trunk; I'm swamped these days
and simply hadn't got around to it.
> P.S. I had 'fun' trying to get your name in the commit log. I hope I
> got it right... =)
Ah! I'm afraid you seem to have failed. trying, anyway. This would
probably work:
env LANG=en_US.UTF-8 svn propedit --revprop -r??? svn:log https://svn.apache.org/repos/asf/httpd/httpd
then paste in the name from Subversion's COMMITTERS file.
-- Brane
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Branko Čibej <br...@xbc.nu>.
Justin Erenkrantz wrote:
> --On Wednesday, February 23, 2005 3:07 AM +0100 "Branko ?ibej"
> <br...@xbc.nu> wrote:
>
>> A number of public functions in mod_dav.h aren't properly exported with
>> DAV_DECLARE. This recently became a problem for Subversion, because
>> mod_dav_svn now supports DAV locking, and mod_dav's locking functions
>> were
>> amongst the ones that were not exported. Nobody noticed this on Unix
>> where
>> DAV_DECLARE is a no-op, but Windows suffered mightily.
>>
>> The attached patch (against the 2.0.x branch) fixes the problem. I
>> had to
>> use DAV_DECLARE_NONSTD in a few places where the functions are used as
>> callbacks, because I didn't want to fiddle with the __stdcall horror in
>> callback parameter declarations.
>>
>> Subversion 1.2, which will introduce locking functionality, will not
>> work as
>> a DAV server on Windows without an httpd-2.0.x release that includes
>> this
>> patch. I hope such a thing is possible in the next few months, and
>> I'm only
>> sorry I was too late for the the 2.0.53 release.
>
>
> I've committed it to trunk and have proposed it for backport. -- justin
Thanks! Sorry I didn't provide a patch for trunk; I'm swamped these days
and simply hadn't got around to it.
> P.S. I had 'fun' trying to get your name in the commit log. I hope I
> got it right... =)
Ah! I'm afraid you seem to have failed. trying, anyway. This would
probably work:
env LANG=en_US.UTF-8 svn propedit --revprop -r??? svn:log https://svn.apache.org/repos/asf/httpd/httpd
then paste in the name from Subversion's COMMITTERS file.
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Wednesday, February 23, 2005 3:07 AM +0100 "Branko ?ibej" <br...@xbc.nu>
wrote:
> A number of public functions in mod_dav.h aren't properly exported with
> DAV_DECLARE. This recently became a problem for Subversion, because
> mod_dav_svn now supports DAV locking, and mod_dav's locking functions were
> amongst the ones that were not exported. Nobody noticed this on Unix where
> DAV_DECLARE is a no-op, but Windows suffered mightily.
>
> The attached patch (against the 2.0.x branch) fixes the problem. I had to
> use DAV_DECLARE_NONSTD in a few places where the functions are used as
> callbacks, because I didn't want to fiddle with the __stdcall horror in
> callback parameter declarations.
>
> Subversion 1.2, which will introduce locking functionality, will not work as
> a DAV server on Windows without an httpd-2.0.x release that includes this
> patch. I hope such a thing is possible in the next few months, and I'm only
> sorry I was too late for the the 2.0.53 release.
I've committed it to trunk and have proposed it for backport. -- justin
P.S. I had 'fun' trying to get your name in the commit log. I hope I got it
right... =)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Wednesday, February 23, 2005 8:46 AM -0600 Ben Collins-Sussman
<su...@collab.net> wrote:
>> The attached patch (against the 2.0.x branch) fixes the problem.
>
> Shouldn't this patch be applied to *both* the 2.0 and 2.2 httpd lines? Does
> that mean applying to httpd /trunk, then backporting to the 2.0 branch?
Yes. We don't apply patches to 2.0 first. Everything must go through trunk
first. -- justin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Wednesday, February 23, 2005 8:46 AM -0600 Ben Collins-Sussman
<su...@collab.net> wrote:
>> The attached patch (against the 2.0.x branch) fixes the problem.
>
> Shouldn't this patch be applied to *both* the 2.0 and 2.2 httpd lines? Does
> that mean applying to httpd /trunk, then backporting to the 2.0 branch?
Yes. We don't apply patches to 2.0 first. Everything must go through trunk
first. -- justin
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Ben Collins-Sussman <su...@collab.net>.
On Feb 22, 2005, at 8:07 PM, Branko Čibej wrote:
>
> The attached patch (against the 2.0.x branch) fixes the problem.
Shouldn't this patch be applied to *both* the 2.0 and 2.2 httpd lines?
Does that mean applying to httpd /trunk, then backporting to the 2.0
branch?
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Wednesday, February 23, 2005 3:07 AM +0100 "Branko ?ibej" <br...@xbc.nu>
wrote:
> A number of public functions in mod_dav.h aren't properly exported with
> DAV_DECLARE. This recently became a problem for Subversion, because
> mod_dav_svn now supports DAV locking, and mod_dav's locking functions were
> amongst the ones that were not exported. Nobody noticed this on Unix where
> DAV_DECLARE is a no-op, but Windows suffered mightily.
>
> The attached patch (against the 2.0.x branch) fixes the problem. I had to
> use DAV_DECLARE_NONSTD in a few places where the functions are used as
> callbacks, because I didn't want to fiddle with the __stdcall horror in
> callback parameter declarations.
>
> Subversion 1.2, which will introduce locking functionality, will not work as
> a DAV server on Windows without an httpd-2.0.x release that includes this
> patch. I hope such a thing is possible in the next few months, and I'm only
> sorry I was too late for the the 2.0.53 release.
I've committed it to trunk and have proposed it for backport. -- justin
P.S. I had 'fun' trying to get your name in the commit log. I hope I got it
right... =)
Re: [PATCH] Fix mod_dav exports on Windows
Posted by Ben Collins-Sussman <su...@collab.net>.
On Feb 22, 2005, at 8:07 PM, Branko Čibej wrote:
>
> The attached patch (against the 2.0.x branch) fixes the problem.
Shouldn't this patch be applied to *both* the 2.0 and 2.2 httpd lines?
Does that mean applying to httpd /trunk, then backporting to the 2.0
branch?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org