diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-12-10 08:56:42 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-12-10 08:56:42 +0000 |
| commit | 57c44ae229a9035cd91654011e131e1a2dd7d88f (patch) | |
| tree | f6915e7e48d20a78cfd3923f2945f30a8bbfbff9 /file_io | |
| parent | 96486f3570391485aa7ca0e004809caf05a5ddb0 (diff) | |
| download | libapr-57c44ae229a9035cd91654011e131e1a2dd7d88f.tar.gz | |
IIUC, users expect APR_EAGAIN() to respond TRUE if a lock has contention
calling apr_file_lock() with APR_FLOCK_NONBLOCK. In that case, we need
to include this in our APR_EAGAIN() case list.
I suspect OS2 may want the same.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64135 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
| -rw-r--r-- | file_io/win32/flock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/file_io/win32/flock.c b/file_io/win32/flock.c index d57b09237..991db9037 100644 --- a/file_io/win32/flock.c +++ b/file_io/win32/flock.c @@ -66,11 +66,6 @@ APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type) flags = ((type & APR_FLOCK_NONBLOCK) ? LOCKFILE_FAIL_IMMEDIATELY : 0) + (((type & APR_FLOCK_TYPEMASK) == APR_FLOCK_SHARED) ? 0 : LOCKFILE_EXCLUSIVE_LOCK); - /* XXX on NT 4.0 we get ERROR_LOCK_VIOLATION when we specify - * LOCKFILE_FAIL_IMMEDIATELY and another process is holding - * the lock; something needs to be done so an APR app can - * recognize this as a try-again situation - */ if (apr_os_level >= APR_WIN_NT) { /* Syntax is correct, len is passed for LengthLow and LengthHigh*/ OVERLAPPED offset; |