refactor: removes context on the C side #1404
Open
+362
−391
Conversation
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
dunglas
reviewed
Feb 24, 2025
caddy/caddy.go
Outdated
| @@ -63,6 +64,8 @@ type FrankenPHPApp struct { | |||
| Workers []workerConfig `json:"workers,omitempty"` | |||
| // Overwrites the default php ini configuration | |||
| PhpIni map[string]string `json:"php_ini,omitempty"` | |||
| // The maximum amount of time a request may be stalled wainting for threads | |||
There was a problem hiding this comment.
Suggested change
| // The maximum amount of time a request may be stalled wainting for threads | |
| // The maximum amount of time a request may be stalled waiting for threads |
There was a problem hiding this comment.
I removed the 'busy timeout' and will put it into a separate PR. This PR now only refactors the context (smaller PRs are easier to review)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Most of this PR is a refactor of the
FrankenPHPContext. I noticed that having a context on both the C and the go side can be pretty confusing and error prone. Especially considering that fatal errors (like timeouts) will make a worker just jump to the end of a script. This PR removes most of the context on the C side and decouples some components fromnet/httpby passing the context in channels.Having minimal thread-local context on the C side should also make it easier to execute PHP directly in go threads in the future.