Fixes #164 #167
Merged
Fixes #164 #167
+42
−29
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
|
I think your changes here look good, but doing some testing I found some odd behavior. I'm not 100% sure of all my conclusions, but I put together draft PR for your reference for possible inclusion into this change. #169 |
Co-authored-by: Javier Evans <[email protected]>
This change adds three new flags when using curl to hit endpoints as part of integration tests: --connect-timeout 3 --max-time 30 --no-progress-meter
This change allows for the test script to be run against a container that is using a custom nginx build compiled with the --with-debug flag.
The newest changes to njs require additional dependencies for compilation. This change adds those dependencies and brings the compiler flags closer to the configuration provided by the OSS packages.
4141done
approved these changes
Sep 15, 2023
There was a problem hiding this comment.
@dekobon I think these changes will accomplish the fix for issue #164
We have not received confirmation from the original reporter but some time has passed and this certainly a bug so I think we can move ahead with the fix.
If you could just look over my removal of the debug code and give a 👍 then I think we can merge.
elJosho
pushed a commit
to elJosho/nginx-s3-gateway
that referenced
this pull request
Oct 25, 2023
This PR fixes the issue nginxinc#164 ## Expectations This solution assumes that the following configuration options are set to true * `APPEND_SLASH_FOR_POSSIBLE_DIRECTORY` * `PROVIDE_INDEX_PAGE` * `ALLOW_DIRECTORY_LIST` Given a folder `test` **with** an `index.html` present in the directory, the `index.html` should be served for: * `/test` * `/test/` * `/test?foo=bar` * `/test/?foo=bar` Given a folder `test` **WITHOUT** an `index.html` present in the directory, files in the directory should be listed for: * `/test` * `/test/` * `/test?foo=bar` * `/test/?foo=bar` ## Notes * The `@trailslash` was rewriting to `$request_uri` with a trailing slash on the end. In the case of `/test?foo=bar` we'd wind up with `/test?foo=bar/` which when combined with the other changes led to a rewrite loop * Changed the check for directory or file to consider the path without anchor or querystring * Added yet another integration test suite and shuffled around the conditionals that maybe make the tests even more confusing - but do cover this case. Co-authored-by: Javier Evans <[email protected]> * make the isDirectory check simpler and more inclusive of error states * Allow useful output from curl and enable timeouts This change adds three new flags when using curl to hit endpoints as part of integration tests: --connect-timeout 3 --max-time 30 --no-progress-meter --------- Co-authored-by: Javier Evans <[email protected]>
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.
This PR fixes the issue #164
Expectations
This solution assumes that the following configuration options are set to true
APPEND_SLASH_FOR_POSSIBLE_DIRECTORYPROVIDE_INDEX_PAGEALLOW_DIRECTORY_LISTGiven a folder
testwith anindex.htmlpresent in the directory, theindex.htmlshould be served for:/test/test//test?foo=bar/test/?foo=barGiven a folder
testWITHOUT anindex.htmlpresent in the directory, files in the directory should be listed for:/test/test//test?foo=bar/test/?foo=barNotes
@trailslashwas rewriting to$request_uriwith a trailing slash on the end. In the case of/test?foo=barwe'd wind up with/test?foo=bar/which when combined with the other changes led to a rewrite loop