Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use maintained gziphandler #30592

Merged
merged 13 commits into from
Apr 21, 2024
Merged

Use maintained gziphandler #30592

merged 13 commits into from
Apr 21, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 19, 2024

Replace #27894

@lunny lunny added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Apr 19, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 19, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 19, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/dependencies labels Apr 19, 2024
@techknowlogick
Copy link
Member

CI fail seems related:

??? [TestLogger] 2024/04/19 05:52:01 ...dules/web/handler.go:79:func1() [E] unable to prepare handler arguments for gzhttp/compress.go:464(gzhttp.NewWrapper): unsupported argument type: http.Handler
panic: unsupported argument type: http.Handler [recovered]
	panic: unsupported argument type: http.Handler

@lunny
Copy link
Member Author

lunny commented Apr 19, 2024

CI fail seems related:

??? [TestLogger] 2024/04/19 05:52:01 ...dules/web/handler.go:79:func1() [E] unable to prepare handler arguments for gzhttp/compress.go:464(gzhttp.NewWrapper): unsupported argument type: http.Handler
panic: unsupported argument type: http.Handler [recovered]
	panic: unsupported argument type: http.Handler

Fixed.

silverwind
silverwind reviewed Apr 19, 2024
View reviewed changes
routers/web/web.go Outdated Show resolved Hide resolved
@delvh delvh changed the title Use github.com/klauspost/compress/gzhttp instead of github.com/NYTimes/gziphandler Use maintained gziphandler Apr 20, 2024
delvh
delvh approved these changes Apr 20, 2024
View reviewed changes
routers/web/web.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 20, 2024
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 20, 2024
wxiaoguang
wxiaoguang reviewed Apr 20, 2024
View reviewed changes
routers/web/web.go Outdated Show resolved Hide resolved
wxiaoguang
wxiaoguang reviewed Apr 20, 2024
View reviewed changes
routers/web/web.go Outdated Show resolved Hide resolved
wxiaoguang
wxiaoguang reviewed Apr 20, 2024
View reviewed changes
routers/web/web.go Outdated Show resolved Hide resolved
wxiaoguang
wxiaoguang reviewed Apr 20, 2024
View reviewed changes
routers/web/web.go Outdated Show resolved Hide resolved
@wxiaoguang wxiaoguang added the backport/v1.21 This PR should be backported to Gitea 1.21 label Apr 20, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 20, 2024
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 20, 2024
@lunny lunny enabled auto-merge (squash) April 21, 2024 00:46
@lunny lunny merged commit e865de1 into go-gitea:main Apr 21, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 21, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 21, 2024
@lunny lunny deleted the lunny/replace_gziphandler branch April 21, 2024 14:48
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @lunny, please send one manually. 🍵

go run ./contrib/backport 30592
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Apr 21, 2024
lunny added a commit to lunny/gitea that referenced this pull request Apr 22, 2024
@lunny @delvh @wxiaoguang
Use maintained gziphandler (go-gitea#30592)
3749c83 
Replace go-gitea#27894

---------

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
lunny added a commit to lunny/gitea that referenced this pull request Apr 22, 2024
@lunny @delvh @wxiaoguang
Use maintained gziphandler (go-gitea#30592)
6bcc70e 
Replace go-gitea#27894

---------

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This was referenced Apr 22, 2024
Merged
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Apr 22, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 22, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
f607c27 
* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  Use correct hash for "git update-index" (go-gitea#30626)
  Fix repo home UI when there is no repo description (go-gitea#30552)
  Fix dropdown text ellipsis (go-gitea#30628)
  fix(api): refactor branch and tag existence checks (go-gitea#30618)
  Add --skip-db option to dump command (go-gitea#30613)
  Fix flash on dashboard (go-gitea#30572)
  chore: use errors.New to replace fmt.Errorf with no parameters will much better (go-gitea#30621)
  Fix issue comment form and quick-submit (go-gitea#30623)
  Use maintained gziphandler (go-gitea#30592)
  [skip ci] Updated translations via Crowdin
  Fix package list performance (go-gitea#30520)
  Clarify permission "HasAccess" behavior (go-gitea#30585)
  Fix links in PyPI Simple Repository API page (go-gitea#30594)
  Use action user as the trigger user of schedules (go-gitea#30581)
  Fix commit file status parser (go-gitea#30602)
  Fix HEAD method for robots.txt (go-gitea#30603)
lunny added a commit that referenced this pull request Apr 23, 2024
@lunny @delvh @wxiaoguang
Use maintained gziphandler (#30592) (#30638)
d95408b 
Replace #27894
Backport #30592

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
lunny added a commit that referenced this pull request Apr 23, 2024
@lunny @delvh @wxiaoguang
Use maintained gziphandler (#30592) (#30637)
0027ca8 
Replace #27894
Backport #30592

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 27, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind left review comments

@delvh delvh delvh approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/dependencies modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.
6 participants
@lunny @techknowlogick @GiteaBot @silverwind @wxiaoguang @delvh