Any progress on this? A 1.6 release seems to be very close but I don't
know whether th 1.6 code is reasonable for release as it is right now.
Regards,
Rainer
Am 29.06.2018 um 09:49 schrieb jean-frederic clere:
On 27/06/18 19:08, William A Rowe Jr wrote:
Any reason this is absent from development branch 1.7.x? I think all such
1.x-only issues should be started there. (Similarly with apr-util.)
Oops my bad :-( Thanks!
and I need to check if the trunk code can be use there:
file->flags & APR_FOPEN_XTHREAD instead file->mutex
Cheers
Jean-Frederic
On Wed, Jun 27, 2018 at 10:21 AM, <jfcl...@apache.org
<mailto:jfcl...@apache.org>> wrote:
Author: jfclere
Date: Wed Jun 27 15:21:19 2018
New Revision: 1834513
URL: http://svn.apache.org/viewvc?rev=1834513&view=rev
<http://svn.apache.org/viewvc?rev=1834513&view=rev>
Log:
remove the wrong proposal in STATUS and commit a fix for my crash
problems.
Modified:
apr/apr/branches/1.6.x/STATUS
apr/apr/branches/1.6.x/file_io/win32/buffer.c
Modified: apr/apr/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/STATUS?rev=1834513&r1=1834512&r2=1834513&view=diff
<http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/STATUS?rev=1834513&r1=1834512&r2=1834513&view=diff>
==============================================================================
--- apr/apr/branches/1.6.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.6.x/STATUS [utf-8] Wed Jun 27 15:21:19 2018
@@ -98,10 +98,6 @@ CURRENT VOTES:
1.5.x patch:
http://people.apache.org/~jim/patches/apr-1.5-permset.patch
<http://people.apache.org/~jim/patches/apr-1.5-permset.patch>
+1:
- * make sure we don't unlock mutex when we haven't locked it.
- 1.6.x patch:
http://people.apache.org/~jfclere/patch.180618.txt
<http://people.apache.org/~jfclere/patch.180618.txt>
- +1 jfclere
-
CURRENT test/testall -v EXCEPTIONS:
Please add any platform anomilies to the following exception list.
Modified: apr/apr/branches/1.6.x/file_io/win32/buffer.c
URL:
http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/file_io/win32/buffer.c?rev=1834513&r1=1834512&r2=1834513&view=diff
<http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/file_io/win32/buffer.c?rev=1834513&r1=1834512&r2=1834513&view=diff>
==============================================================================
--- apr/apr/branches/1.6.x/file_io/win32/buffer.c (original)
+++ apr/apr/branches/1.6.x/file_io/win32/buffer.c Wed Jun 27
15:21:19 2018
@@ -23,13 +23,17 @@ APR_DECLARE(apr_status_t) apr_file_buffe
{
apr_status_t rv;
- apr_thread_mutex_lock(file->mutex);
+ if (file->mutex) {
+ apr_thread_mutex_lock(file->mutex);
+ }
if(file->buffered) {
/* Flush the existing buffer */
rv = apr_file_flush(file);
if (rv != APR_SUCCESS) {
- apr_thread_mutex_unlock(file->mutex);
+ if (file->mutex) {
+ apr_thread_mutex_unlock(file->mutex);
+ }
return rv;
}
}
@@ -48,7 +52,9 @@ APR_DECLARE(apr_status_t) apr_file_buffe
file->buffered = 0;
}
- apr_thread_mutex_unlock(file->mutex);
+ if (file->mutex) {
+ apr_thread_mutex_unlock(file->mutex);
+ }
return APR_SUCCESS;
}
