-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix file uploads beyond MMAP_SEGMENT_SIZE (#10793)
* Fix file uploads beyond MMAP_SEGMENT_SIZE The code path was not covered by tests and was broken. I also replaced the ReentrantLock by a NonReentrantLock that is based on a Semaphore. This is because there are some semantic checks in Chunk that might not work with a reentrant lock (e.g. repeated deallocate calls could lead to ref count errors). But this is unrelated to the bug. Fixes #10666 * Update http-server-netty/src/main/java/io/micronaut/http/server/netty/NonReentrantLock.java Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com> * make badssl more resilient to timeouts * make badssl more resilient to timeouts --------- Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>
- Loading branch information
Showing
6 changed files
with
134 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
http-server-netty/src/main/java/io/micronaut/http/server/netty/NonReentrantLock.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
* Copyright 2017-2024 original authors | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package io.micronaut.http.server.netty; | ||
|
||
import io.micronaut.core.annotation.NonNull; | ||
|
||
import java.util.concurrent.Semaphore; | ||
import java.util.concurrent.TimeUnit; | ||
import java.util.concurrent.locks.Condition; | ||
import java.util.concurrent.locks.Lock; | ||
|
||
/** | ||
* Non-reentrant {@link Lock} implementation based on a semaphore. | ||
* | ||
* @author Jonas Konrad | ||
*/ | ||
final class NonReentrantLock extends Semaphore implements Lock { | ||
public NonReentrantLock() { | ||
super(1); | ||
} | ||
|
||
@Override | ||
public void lock() { | ||
acquireUninterruptibly(); | ||
} | ||
|
||
@Override | ||
public void lockInterruptibly() throws InterruptedException { | ||
acquire(); | ||
} | ||
|
||
@Override | ||
public boolean tryLock() { | ||
return tryAcquire(); | ||
} | ||
|
||
@Override | ||
public boolean tryLock(long time, @NonNull TimeUnit unit) throws InterruptedException { | ||
return tryAcquire(time, unit); | ||
} | ||
|
||
@Override | ||
public void unlock() { | ||
release(); | ||
} | ||
|
||
@NonNull | ||
@Override | ||
public Condition newCondition() { | ||
throw new UnsupportedOperationException(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters