Browse Source

change go package path for fork

master
forest 7 months ago
parent
commit
b2b1492c7f
133 changed files with 330 additions and 330 deletions
  1. +7
    -7
      .github/CONTRIBUTING.md
  2. +2
    -2
      .goreleaser.yml
  3. +9
    -9
      README.md
  4. +1
    -1
      admin.go
  5. +2
    -2
      caddy.go
  6. +2
    -2
      caddyconfig/caddyfile/adapter.go
  7. +1
    -1
      caddyconfig/caddyfile/parse.go
  8. +1
    -1
      caddyconfig/configadapters.go
  9. +4
    -4
      caddyconfig/httpcaddyfile/addresses.go
  10. +6
    -6
      caddyconfig/httpcaddyfile/builtins.go
  11. +2
    -2
      caddyconfig/httpcaddyfile/builtins_test.go
  12. +4
    -4
      caddyconfig/httpcaddyfile/directives.go
  13. +10
    -10
      caddyconfig/httpcaddyfile/httptype.go
  14. +1
    -1
      caddyconfig/httpcaddyfile/httptype_test.go
  15. +4
    -4
      caddyconfig/httpcaddyfile/options.go
  16. +2
    -2
      caddyconfig/httpcaddyfile/options_test.go
  17. +2
    -2
      caddyconfig/httpcaddyfile/pkiapp.go
  18. +4
    -4
      caddyconfig/httpcaddyfile/serveroptions.go
  19. +4
    -4
      caddyconfig/httpcaddyfile/tlsapp.go
  20. +1
    -1
      caddyconfig/httpcaddyfile/tlsapp_test.go
  21. +1
    -1
      caddyconfig/httploader.go
  22. +1
    -1
      caddyconfig/load.go
  23. +3
    -3
      caddytest/caddytest.go
  24. +1
    -1
      caddytest/integration/autohttps_test.go
  25. +1
    -1
      caddytest/integration/caddyfile_adapt/http_only_hostnames.txt
  26. +1
    -1
      caddytest/integration/caddyfile_adapt/matchers_in_route.txt
  27. +1
    -1
      caddytest/integration/caddyfile_adapt/tls_conn_policy_consolidate.txt
  28. +1
    -1
      caddytest/integration/caddyfile_adapt_test.go
  29. +1
    -1
      caddytest/integration/caddyfile_test.go
  30. +1
    -1
      caddytest/integration/handler_test.go
  31. +1
    -1
      caddytest/integration/map_test.go
  32. +1
    -1
      caddytest/integration/reverseproxy_test.go
  33. +1
    -1
      caddytest/integration/sni_test.go
  34. +3
    -3
      caddytest/integration/stream_test.go
  35. +2
    -2
      cmd/caddy/main.go
  36. +3
    -3
      cmd/commandfuncs.go
  37. +2
    -2
      cmd/main.go
  38. +1
    -1
      go.mod
  39. +3
    -3
      listeners.go
  40. +3
    -3
      modules/caddyhttp/app.go
  41. +3
    -3
      modules/caddyhttp/autohttps.go
  42. +1
    -1
      modules/caddyhttp/caddyauth/basicauth.go
  43. +2
    -2
      modules/caddyhttp/caddyauth/caddyauth.go
  44. +4
    -4
      modules/caddyhttp/caddyauth/caddyfile.go
  45. +2
    -2
      modules/caddyhttp/caddyauth/command.go
  46. +1
    -1
      modules/caddyhttp/caddyauth/hashes.go
  47. +2
    -2
      modules/caddyhttp/caddyhttp.go
  48. +2
    -2
      modules/caddyhttp/celmatcher.go
  49. +1
    -1
      modules/caddyhttp/celmatcher_test.go
  50. +2
    -2
      modules/caddyhttp/encode/brotli/brotli_precompressed.go
  51. +5
    -5
      modules/caddyhttp/encode/caddyfile.go
  52. +2
    -2
      modules/caddyhttp/encode/encode.go
  53. +3
    -3
      modules/caddyhttp/encode/gzip/gzip.go
  54. +2
    -2
      modules/caddyhttp/encode/gzip/gzip_precompressed.go
  55. +3
    -3
      modules/caddyhttp/encode/zstd/zstd.go
  56. +2
    -2
      modules/caddyhttp/encode/zstd/zstd_precompressed.go
  57. +1
    -1
      modules/caddyhttp/errors.go
  58. +2
    -2
      modules/caddyhttp/fileserver/browse.go
  59. +1
    -1
      modules/caddyhttp/fileserver/browse_test.go
  60. +1
    -1
      modules/caddyhttp/fileserver/browselisting.go
  61. +6
    -6
      modules/caddyhttp/fileserver/caddyfile.go
  62. +5
    -5
      modules/caddyhttp/fileserver/command.go
  63. +3
    -3
      modules/caddyhttp/fileserver/matcher.go
  64. +2
    -2
      modules/caddyhttp/fileserver/matcher_test.go
  65. +4
    -4
      modules/caddyhttp/fileserver/staticfiles.go
  66. +2
    -2
      modules/caddyhttp/headers/caddyfile.go
  67. +2
    -2
      modules/caddyhttp/headers/headers.go
  68. +2
    -2
      modules/caddyhttp/headers/headers_test.go
  69. +2
    -2
      modules/caddyhttp/map/caddyfile.go
  70. +2
    -2
      modules/caddyhttp/map/map.go
  71. +2
    -2
      modules/caddyhttp/matchers.go
  72. +1
    -1
      modules/caddyhttp/matchers_test.go
  73. +3
    -3
      modules/caddyhttp/push/caddyfile.go
  74. +3
    -3
      modules/caddyhttp/push/handler.go
  75. +2
    -2
      modules/caddyhttp/replacer.go
  76. +1
    -1
      modules/caddyhttp/replacer_test.go
  77. +2
    -2
      modules/caddyhttp/requestbody/caddyfile.go
  78. +2
    -2
      modules/caddyhttp/requestbody/requestbody.go
  79. +1
    -1
      modules/caddyhttp/responsewriter.go
  80. +6
    -6
      modules/caddyhttp/reverseproxy/caddyfile.go
  81. +6
    -6
      modules/caddyhttp/reverseproxy/command.go
  82. +8
    -8
      modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go
  83. +5
    -5
      modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go
  84. +2
    -2
      modules/caddyhttp/reverseproxy/healthchecks.go
  85. +2
    -2
      modules/caddyhttp/reverseproxy/hosts.go
  86. +2
    -2
      modules/caddyhttp/reverseproxy/httptransport.go
  87. +6
    -6
      modules/caddyhttp/reverseproxy/reverseproxy.go
  88. +2
    -2
      modules/caddyhttp/reverseproxy/selectionpolicies.go
  89. +2
    -2
      modules/caddyhttp/reverseproxy/streaming.go
  90. +4
    -4
      modules/caddyhttp/rewrite/caddyfile.go
  91. +2
    -2
      modules/caddyhttp/rewrite/rewrite.go
  92. +1
    -1
      modules/caddyhttp/rewrite/rewrite_test.go
  93. +1
    -1
      modules/caddyhttp/routes.go
  94. +2
    -2
      modules/caddyhttp/server.go
  95. +15
    -15
      modules/caddyhttp/standard/imports.go
  96. +2
    -2
      modules/caddyhttp/staticerror.go
  97. +2
    -2
      modules/caddyhttp/staticresp.go
  98. +1
    -1
      modules/caddyhttp/staticresp_test.go
  99. +1
    -1
      modules/caddyhttp/subroute.go
  100. +2
    -2
      modules/caddyhttp/templates/caddyfile.go

+ 7
- 7
.github/CONTRIBUTING.md View File

@ -23,7 +23,7 @@ Other menu items:
### Contributing code
You can have a huge impact on the project by helping with its code. To contribute code to Caddy, first submit or comment in an issue to discuss your contribution, then open a [pull request](https://github.com/caddyserver/caddy/pulls) (PR). If you're new to our community, that's okay: **we gladly welcome pull requests from anyone, regardless of your native language or coding experience.** You can get familiar with Caddy's code base by using [code search at Sourcegraph](https://sourcegraph.com/github.com/caddyserver/caddy).
You can have a huge impact on the project by helping with its code. To contribute code to Caddy, first submit or comment in an issue to discuss your contribution, then open a [pull request](https://git.sequentialread.com/forest/caddy/pulls) (PR). If you're new to our community, that's okay: **we gladly welcome pull requests from anyone, regardless of your native language or coding experience.** You can get familiar with Caddy's code base by using [code search at Sourcegraph](https://sourcegraph.com/git.sequentialread.com/forest/caddy).
We hold contributions to a high standard for quality :bowtie:, so don't be surprised if we ask for revisions—even if it seems small or insignificant. Please don't take it personally. :blue_heart: If your change is on the right track, we can guide you to make it mergable.
@ -54,9 +54,9 @@ We often grant [collaborator status](#collaborator-instructions) to contributors
Contributing to Go projects on GitHub is fun and easy. After you have proposed your change in an issue, we recommend the following workflow:
1. [Fork this repo](https://github.com/caddyserver/caddy). This makes a copy of the code you can write to.
1. [Fork this repo](https://git.sequentialread.com/forest/caddy). This makes a copy of the code you can write to.
2. If you don't already have this repo (caddyserver/caddy.git) repo on your computer, clone it down: `git clone https://github.com/caddyserver/caddy.git`
2. If you don't already have this repo (caddyserver/caddy.git) repo on your computer, clone it down: `git clone https://git.sequentialread.com/forest/caddy.git`
3. Tell git that it can push the caddyserver/caddy.git repo to your fork by adding a remote: `git remote add myfork https://github.com/<your-username>/caddy.git`
@ -64,7 +64,7 @@ Contributing to Go projects on GitHub is fun and easy. After you have proposed y
5. Push your changes to your fork: `git push myfork`
6. [Create a pull request](https://github.com/caddyserver/caddy/pull/new/master) to merge your changes into caddyserver/caddy @ master. (Click "compare across forks" and change the head fork.)
6. [Create a pull request](https://git.sequentialread.com/forest/caddy/pull/new/master) to merge your changes into caddyserver/caddy @ master. (Click "compare across forks" and change the head fork.)
This workflow is nice because you don't have to change import paths. You can get fancier by using different branches if you want.
@ -85,7 +85,7 @@ Many people on the forums could benefit from your experience and expertise, too.
### Reporting bugs
Like every software, Caddy has its flaws. If you find one, [search the issues](https://github.com/caddyserver/caddy/issues) to see if it has already been reported. If not, [open a new issue](https://github.com/caddyserver/caddy/issues/new) and describe the bug, and somebody will look into it! (This repository is only for Caddy and its standard modules.)
Like every software, Caddy has its flaws. If you find one, [search the issues](https://git.sequentialread.com/forest/caddy/issues) to see if it has already been reported. If not, [open a new issue](https://git.sequentialread.com/forest/caddy/issues/new) and describe the bug, and somebody will look into it! (This repository is only for Caddy and its standard modules.)
**You can help us fix bugs!** Speed up the patch by identifying the bug in the code. This can sometimes be done by adding `fmt.Println()` statements (or similar) in relevant code paths to narrow down where the problem may be. It's a good way to [introduce yourself to the Go language](https://tour.golang.org), too.
@ -124,7 +124,7 @@ The maintainer is usually able to do the rest; but of course the reporter may in
### Suggesting features
First, [search to see if your feature has already been requested](https://github.com/caddyserver/caddy/issues). If it has, you can add a :+1: reaction to vote for it. If your feature idea is new, open an issue to request the feature. Please describe your idea thoroughly so that we know how to implement it! Really vague requests may not be helpful or actionable and, without clarification, will have to be closed.
First, [search to see if your feature has already been requested](https://git.sequentialread.com/forest/caddy/issues). If it has, you can add a :+1: reaction to vote for it. If your feature idea is new, open an issue to request the feature. Please describe your idea thoroughly so that we know how to implement it! Really vague requests may not be helpful or actionable and, without clarification, will have to be closed.
While we really do value your requests and implement many of them, not all features are a good fit for Caddy. Most of those [make good modules](#writing-a-caddy-module), which can be made by anyone! But if a feature is not in the best interest of the Caddy project or its users in general, we may politely decline to implement it into Caddy core. Additionally, some features are bad ideas altogether (for either obvious or non-obvious reasons) which may be rejected. We'll try to explain why we reject a feature, but sometimes the best we can do is, "It's not a good fit for the project."
@ -179,7 +179,7 @@ Collaborators have push rights to the repository. We grant this permission after
## Security Policy
If you think you've found a security vulnerability, please refer to our [Security Policy](https://github.com/caddyserver/caddy/security/policy) document.
If you think you've found a security vulnerability, please refer to our [Security Policy](https://git.sequentialread.com/forest/caddy/security/policy) document.
## Thank you


+ 2
- 2
.goreleaser.yml View File

@ -7,10 +7,10 @@ before:
- mkdir -p caddy-build
- cp cmd/caddy/main.go caddy-build/main.go
- cp ./go.mod caddy-build/go.mod
- sed -i.bkp 's|github.com/caddyserver/caddy/v2|caddy|g' ./caddy-build/go.mod
- sed -i.bkp 's|git.sequentialread.com/forest/caddy/v2|caddy|g' ./caddy-build/go.mod
# GoReleaser doesn't seem to offer {{.Tag}} at this stage, so we have to embed it into the env
# so we run: TAG=$(git describe --abbrev=0) goreleaser release --rm-dist --skip-publish --skip-validate
- go mod edit -require=github.com/caddyserver/caddy/v2@{{.Env.TAG}} ./caddy-build/go.mod
- go mod edit -require=git.sequentialread.com/forest/caddy/v2@{{.Env.TAG}} ./caddy-build/go.mod
# as of Go 1.16, `go` commands no longer automatically change go.{mod,sum}. We now have to explicitly
# run `go mod tidy`. The `/bin/sh -c '...'` is because goreleaser can't find cd in PATH without shell invocation.
- /bin/sh -c 'cd ./caddy-build && go mod tidy'


+ 9
- 9
README.md View File

@ -7,17 +7,17 @@
<h3 align="center">Every site on HTTPS</h3>
<p align="center">Caddy is an extensible server platform that uses TLS by default.</p>
<p align="center">
<a href="https://github.com/caddyserver/caddy/actions?query=workflow%3ACross-Platform"><img src="https://github.com/caddyserver/caddy/workflows/Cross-Platform/badge.svg"></a>
<a href="https://pkg.go.dev/github.com/caddyserver/caddy/v2"><img src="https://img.shields.io/badge/godoc-reference-%23007d9c.svg"></a>
<a href="https://git.sequentialread.com/forest/caddy/actions?query=workflow%3ACross-Platform"><img src="https://git.sequentialread.com/forest/caddy/workflows/Cross-Platform/badge.svg"></a>
<a href="https://pkg.go.dev/git.sequentialread.com/forest/caddy/v2"><img src="https://img.shields.io/badge/godoc-reference-%23007d9c.svg"></a>
<br>
<a href="https://twitter.com/caddyserver" title="@caddyserver on Twitter"><img src="https://img.shields.io/badge/twitter-@caddyserver-55acee.svg" alt="@caddyserver on Twitter"></a>
<a href="https://caddy.community" title="Caddy Forum"><img src="https://img.shields.io/badge/community-forum-ff69b4.svg" alt="Caddy Forum"></a>
<br>
<a href="https://sourcegraph.com/github.com/caddyserver/caddy?badge" title="Caddy on Sourcegraph"><img src="https://sourcegraph.com/github.com/caddyserver/caddy/-/badge.svg" alt="Caddy on Sourcegraph"></a>
<a href="https://sourcegraph.com/git.sequentialread.com/forest/caddy?badge" title="Caddy on Sourcegraph"><img src="https://sourcegraph.com/git.sequentialread.com/forest/caddy/-/badge.svg" alt="Caddy on Sourcegraph"></a>
<a href="https://cloudsmith.io/~caddy/repos/"><img src="https://img.shields.io/badge/OSS%20hosting%20by-cloudsmith-blue?logo=cloudsmith" alt="Cloudsmith"></a>
</p>
<p align="center">
<a href="https://github.com/caddyserver/caddy/releases">Releases</a> ·
<a href="https://git.sequentialread.com/forest/caddy/releases">Releases</a> ·
<a href="https://caddyserver.com/docs/">Documentation</a> ·
<a href="https://caddy.community">Get Help</a>
</p>
@ -67,7 +67,7 @@
## Install
The simplest, cross-platform way is to download from [GitHub Releases](https://github.com/caddyserver/caddy/releases) and place the executable file in your PATH.
The simplest, cross-platform way is to download from [GitHub Releases](https://git.sequentialread.com/forest/caddy/releases) and place the executable file in your PATH.
For other install options, see https://caddyserver.com/docs/install.
@ -82,7 +82,7 @@ Requirements:
_**Note:** These steps [will not embed proper version information](https://github.com/golang/go/issues/29228). For that, please follow the instructions in the next section._
```bash
$ git clone "https://github.com/caddyserver/caddy.git"
$ git clone "https://git.sequentialread.com/forest/caddy.git"
$ cd caddy/cmd/caddy/
$ go build
```
@ -115,9 +115,9 @@ $ xcaddy build
1. Create a new folder: `mkdir caddy`
2. Change into it: `cd caddy`
3. Copy [Caddy's main.go](https://github.com/caddyserver/caddy/blob/master/cmd/caddy/main.go) into the empty folder. Add imports for any custom plugins you want to add.
3. Copy [Caddy's main.go](https://git.sequentialread.com/forest/caddy/blob/master/cmd/caddy/main.go) into the empty folder. Add imports for any custom plugins you want to add.
4. Initialize a Go module: `go mod init caddy`
5. (Optional) Pin Caddy version: `go get github.com/caddyserver/caddy/v2@version` replacing `version` with a git tag, commit, or branch name.
5. (Optional) Pin Caddy version: `go get git.sequentialread.com/forest/caddy/v2@version` replacing `version` with a git tag, commit, or branch name.
6. (Optional) Add plugins by adding their import: `_ "import/path/here"`
7. Compile: `go build`
@ -170,7 +170,7 @@ The docs are also open source. You can contribute to them here: https://github.c
- Individuals can exchange help for free on our community forum at https://caddy.community. Remember that people give help out of their spare time and good will. The best way to get help is to give it first!
Please use our [issue tracker](https://github.com/caddyserver/caddy/issues) only for bug reports and feature requests, i.e. actionable development items (support questions will usually be referred to the forums).
Please use our [issue tracker](https://git.sequentialread.com/forest/caddy/issues) only for bug reports and feature requests, i.e. actionable development items (support questions will usually be referred to the forums).


+ 1
- 1
admin.go View File

@ -39,7 +39,7 @@ import (
"sync"
"time"
"github.com/caddyserver/caddy/v2/notify"
"git.sequentialread.com/forest/caddy/v2/notify"
"github.com/caddyserver/certmagic"
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap"


+ 2
- 2
caddy.go View File

@ -32,7 +32,7 @@ import (
"sync"
"time"
"github.com/caddyserver/caddy/v2/notify"
"git.sequentialread.com/forest/caddy/v2/notify"
"github.com/caddyserver/certmagic"
"github.com/google/uuid"
"go.uber.org/zap"
@ -756,4 +756,4 @@ var (
)
// ImportPath is the package import path for Caddy core.
const ImportPath = "github.com/caddyserver/caddy/v2"
const ImportPath = "git.sequentialread.com/forest/caddy/v2"

+ 2
- 2
caddyconfig/caddyfile/adapter.go View File

@ -19,8 +19,8 @@ import (
"encoding/json"
"fmt"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
)
// Adapter adapts Caddyfile to Caddy JSON.


+ 1
- 1
caddyconfig/caddyfile/parse.go View File

@ -24,7 +24,7 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
// Parse parses the input just enough to group tokens, in


+ 1
- 1
caddyconfig/configadapters.go View File

@ -18,7 +18,7 @@ import (
"encoding/json"
"fmt"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
// Adapter is a type which can adapt a configuration to Caddy JSON.


+ 4
- 4
caddyconfig/httpcaddyfile/addresses.go View File

@ -23,9 +23,9 @@ import (
"strings"
"unicode"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/certmagic"
)
@ -373,7 +373,7 @@ func (a Address) Key() string {
// lowerExceptPlaceholders lowercases s except within
// placeholders (substrings in non-escaped '{ }' spans).
// See https://github.com/caddyserver/caddy/issues/3264
// See https://git.sequentialread.com/forest/caddy/issues/3264
func lowerExceptPlaceholders(s string) string {
var sb strings.Builder
var escaped, inPlaceholder bool


+ 6
- 6
caddyconfig/httpcaddyfile/builtins.go View File

@ -25,11 +25,11 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
"github.com/caddyserver/certmagic"
"github.com/mholt/acmez/acme"
"go.uber.org/zap/zapcore"
@ -118,7 +118,7 @@ func parseTLS(h Helper) ([]ConfigValue, error) {
// tag this certificate so if multiple certs match, specifically
// this one that the user has provided will be used, see #2588:
// https://github.com/caddyserver/caddy/issues/2588 ... but we
// https://git.sequentialread.com/forest/caddy/issues/2588 ... but we
// must be careful about how we do this; being careless will
// lead to failed handshakes
//


+ 2
- 2
caddyconfig/httpcaddyfile/builtins_test.go View File

@ -3,8 +3,8 @@ package httpcaddyfile
import (
"testing"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
_ "github.com/caddyserver/caddy/v2/modules/logging"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
_ "git.sequentialread.com/forest/caddy/v2/modules/logging"
)
func TestLogDirectiveSyntax(t *testing.T) {


+ 4
- 4
caddyconfig/httpcaddyfile/directives.go View File

@ -21,10 +21,10 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
// directiveOrder specifies the order


+ 10
- 10
caddyconfig/httpcaddyfile/httptype.go View File

@ -24,12 +24,12 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddypki"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddypki"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
)
func init() {
@ -190,7 +190,7 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock,
// As a special case, we want "handle_path" to be sorted
// at the same level as "handle", so we force them to use
// the same directive name after their parsing is complete.
// See https://github.com/caddyserver/caddy/issues/3675#issuecomment-678042377
// See https://git.sequentialread.com/forest/caddy/issues/3675#issuecomment-678042377
if dir == "handle_path" {
dir = "handle"
}
@ -497,7 +497,7 @@ func (st *ServerType) serversFromPairings(
if iWildcardHost != jWildcardHost {
// site blocks that have a key with a wildcard in the hostname
// must always be less specific than blocks without one; see
// https://github.com/caddyserver/caddy/issues/3410
// https://git.sequentialread.com/forest/caddy/issues/3410
return jWildcardHost && !iWildcardHost
}
if specificity(iLongestHost) == specificity(jLongestHost) {
@ -628,7 +628,7 @@ func (st *ServerType) serversFromPairings(
}
// add log associations
// see https://github.com/caddyserver/caddy/issues/3310
// see https://git.sequentialread.com/forest/caddy/issues/3310
sblockLogHosts := sblock.hostsFromKeys(true)
for _, cval := range sblock.pile["custom_log"] {
ncl := cval.Value.(namedCustomLog)
@ -685,7 +685,7 @@ func (st *ServerType) serversFromPairings(
// least have a matching connection policy, so here we append a
// catch-all/default policy if there isn't one already (it's
// important that it goes at the end) - see issue #3004:
// https://github.com/caddyserver/caddy/issues/3004
// https://git.sequentialread.com/forest/caddy/issues/3004
// TODO: maybe a smarter way to handle this might be to just make the
// auto-HTTPS logic at provision-time detect if there is any connection
// policy missing for any HTTPS-enabled hosts, if so, add it... maybe?


+ 1
- 1
caddyconfig/httpcaddyfile/httptype_test.go View File

@ -3,7 +3,7 @@ package httpcaddyfile
import (
"testing"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
)
func TestMatcherSyntax(t *testing.T) {


+ 4
- 4
caddyconfig/httpcaddyfile/options.go View File

@ -17,10 +17,10 @@ package httpcaddyfile
import (
"strconv"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
"github.com/caddyserver/certmagic"
"github.com/mholt/acmez/acme"
)


+ 2
- 2
caddyconfig/httpcaddyfile/options_test.go View File

@ -3,8 +3,8 @@ package httpcaddyfile
import (
"testing"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
_ "github.com/caddyserver/caddy/v2/modules/logging"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
_ "git.sequentialread.com/forest/caddy/v2/modules/logging"
)
func TestGlobalLogOptionSyntax(t *testing.T) {


+ 2
- 2
caddyconfig/httpcaddyfile/pkiapp.go View File

@ -15,8 +15,8 @@
package httpcaddyfile
import (
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/modules/caddypki"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/modules/caddypki"
)
func (st ServerType) buildPKIApp(


+ 4
- 4
caddyconfig/httpcaddyfile/serveroptions.go View File

@ -18,10 +18,10 @@ import (
"encoding/json"
"fmt"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"github.com/dustin/go-humanize"
)


+ 4
- 4
caddyconfig/httpcaddyfile/tlsapp.go View File

@ -23,10 +23,10 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
"github.com/caddyserver/certmagic"
"github.com/mholt/acmez/acme"
)


+ 1
- 1
caddyconfig/httpcaddyfile/tlsapp_test.go View File

@ -3,7 +3,7 @@ package httpcaddyfile
import (
"testing"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
)
func TestAutomationPolicyIsSubset(t *testing.T) {


+ 1
- 1
caddyconfig/httploader.go View File

@ -8,7 +8,7 @@ import (
"net/http"
"time"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func init() {


+ 1
- 1
caddyconfig/load.go View File

@ -24,7 +24,7 @@ import (
"strings"
"sync"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func init() {


+ 3
- 3
caddytest/caddytest.go View File

@ -22,11 +22,11 @@ import (
"time"
"github.com/aryann/difflib"
"github.com/caddyserver/caddy/v2/caddyconfig"
caddycmd "github.com/caddyserver/caddy/v2/cmd"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
caddycmd "git.sequentialread.com/forest/caddy/v2/cmd"
// plug in Caddy modules here
_ "github.com/caddyserver/caddy/v2/modules/standard"
_ "git.sequentialread.com/forest/caddy/v2/modules/standard"
)
// Defaults store any configuration required to make the tests run


+ 1
- 1
caddytest/integration/autohttps_test.go View File

@ -4,7 +4,7 @@ import (
"net/http"
"testing"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
)
func TestAutoHTTPtoHTTPSRedirectsImplicitPort(t *testing.T) {


+ 1
- 1
caddytest/integration/caddyfile_adapt/http_only_hostnames.txt View File

@ -1,4 +1,4 @@
# https://github.com/caddyserver/caddy/issues/3977
# https://git.sequentialread.com/forest/caddy/issues/3977
http://* {
respond "Hello, world!"
}


+ 1
- 1
caddytest/integration/caddyfile_adapt/matchers_in_route.txt View File

@ -1,7 +1,7 @@
:80 {
route {
# unused matchers should not panic
# see https://github.com/caddyserver/caddy/issues/3745
# see https://git.sequentialread.com/forest/caddy/issues/3745
@matcher1 path /path1
@matcher2 path /path2
}


+ 1
- 1
caddytest/integration/caddyfile_adapt/tls_conn_policy_consolidate.txt View File

@ -1,4 +1,4 @@
# https://github.com/caddyserver/caddy/issues/3906
# https://git.sequentialread.com/forest/caddy/issues/3906
a.a {
tls internal
respond 403


+ 1
- 1
caddytest/integration/caddyfile_adapt_test.go View File

@ -9,7 +9,7 @@ import (
"strings"
"testing"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
)
func TestCaddyfileAdaptToJSON(t *testing.T) {


+ 1
- 1
caddytest/integration/caddyfile_test.go View File

@ -5,7 +5,7 @@ import (
"net/url"
"testing"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
)
func TestRespond(t *testing.T) {


+ 1
- 1
caddytest/integration/handler_test.go View File

@ -4,7 +4,7 @@ import (
"net/http"
"testing"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
)
func TestBrowse(t *testing.T) {


+ 1
- 1
caddytest/integration/map_test.go View File

@ -4,7 +4,7 @@ import (
"bytes"
"testing"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
)
func TestMap(t *testing.T) {


+ 1
- 1
caddytest/integration/reverseproxy_test.go View File

@ -10,7 +10,7 @@ import (
"strings"
"testing"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
)
func TestSRVReverseProxy(t *testing.T) {


+ 1
- 1
caddytest/integration/sni_test.go View File

@ -3,7 +3,7 @@ package integration
import (
"testing"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
)
func TestDefaultSNI(t *testing.T) {


+ 3
- 3
caddytest/integration/stream_test.go View File

@ -14,12 +14,12 @@ import (
"testing"
"time"
"github.com/caddyserver/caddy/v2/caddytest"
"git.sequentialread.com/forest/caddy/v2/caddytest"
"golang.org/x/net/http2"
"golang.org/x/net/http2/h2c"
)
// (see https://github.com/caddyserver/caddy/issues/3556 for use case)
// (see https://git.sequentialread.com/forest/caddy/issues/3556 for use case)
func TestH2ToH2CStream(t *testing.T) {
tester := caddytest.NewTester(t)
tester.InitServer(`
@ -202,7 +202,7 @@ func testH2ToH2CStreamServeH2C(t *testing.T) *http.Server {
return server
}
// (see https://github.com/caddyserver/caddy/issues/3606 for use case)
// (see https://git.sequentialread.com/forest/caddy/issues/3606 for use case)
func TestH2ToH1ChunkedResponse(t *testing.T) {
tester := caddytest.NewTester(t)
tester.InitServer(`


+ 2
- 2
cmd/caddy/main.go View File

@ -27,10 +27,10 @@
package main
import (
caddycmd "github.com/caddyserver/caddy/v2/cmd"
caddycmd "git.sequentialread.com/forest/caddy/v2/cmd"
// plug in Caddy modules here
_ "github.com/caddyserver/caddy/v2/modules/standard"
_ "git.sequentialread.com/forest/caddy/v2/modules/standard"
)
func main() {


+ 3
- 3
cmd/commandfuncs.go View File

@ -34,9 +34,9 @@ import (
"sort"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"go.uber.org/zap"
)


+ 2
- 2
cmd/main.go View File

@ -31,8 +31,8 @@ import (
"strings"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"github.com/caddyserver/certmagic"
"go.uber.org/zap"
)


+ 1
- 1
go.mod View File

@ -1,4 +1,4 @@
module github.com/caddyserver/caddy/v2
module git.sequentialread.com/forest/caddy/v2
go 1.15


+ 3
- 3
listeners.go View File

@ -231,7 +231,7 @@ func (fcpc *fakeClosePacketConn) Close() error {
return nil
}
// Supports QUIC implementation: https://github.com/caddyserver/caddy/issues/3998
// Supports QUIC implementation: https://git.sequentialread.com/forest/caddy/issues/3998
func (fcpc fakeClosePacketConn) SetReadBuffer(bytes int) error {
if conn, ok := fcpc.PacketConn.(interface{ SetReadBuffer(int) error }); ok {
return conn.SetReadBuffer(bytes)
@ -239,7 +239,7 @@ func (fcpc fakeClosePacketConn) SetReadBuffer(bytes int) error {
return fmt.Errorf("SetReadBuffer() not implemented for %T", fcpc.PacketConn)
}
// Supports QUIC implementation: https://github.com/caddyserver/caddy/issues/3998
// Supports QUIC implementation: https://git.sequentialread.com/forest/caddy/issues/3998
func (fcpc fakeClosePacketConn) SyscallConn() (syscall.RawConn, error) {
if conn, ok := fcpc.PacketConn.(interface {
SyscallConn() (syscall.RawConn, error)
@ -452,7 +452,7 @@ var (
const maxPortSpan = 65535
// Interface guards (see https://github.com/caddyserver/caddy/issues/3998)
// Interface guards (see https://git.sequentialread.com/forest/caddy/issues/3998)
var (
_ (interface{ SetReadBuffer(int) error }) = (*fakeClosePacketConn)(nil)
_ (interface {


+ 3
- 3
modules/caddyhttp/app.go View File

@ -23,8 +23,8 @@ import (
"strconv"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
"github.com/lucas-clemente/quic-go/http3"
"go.uber.org/zap"
"golang.org/x/net/http2"
@ -425,7 +425,7 @@ func (app *App) Stop() error {
}
// close the http3 servers; it's unclear whether the bug reported in
// https://github.com/caddyserver/caddy/pull/2727#issuecomment-526856566
// https://git.sequentialread.com/forest/caddy/pull/2727#issuecomment-526856566
// was ever truly fixed, since it seemed racey/nondeterministic; but
// recent tests in 2020 were unable to replicate the issue again after
// repeated attempts (the bug manifested after a config reload; i.e.


+ 3
- 3
modules/caddyhttp/autohttps.go View File

@ -20,8 +20,8 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
"github.com/caddyserver/certmagic"
"go.uber.org/zap"
)
@ -83,7 +83,7 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
// this maps domain names for automatic HTTP->HTTPS
// redirects to their destination server addresses
// (there might be more than 1 if bind is used; see
// https://github.com/caddyserver/caddy/issues/3443)
// https://git.sequentialread.com/forest/caddy/issues/3443)
redirDomains := make(map[string][]caddy.NetworkAddress)
for srvName, srv := range app.Servers {


+ 1
- 1
modules/caddyhttp/caddyauth/basicauth.go View File

@ -24,7 +24,7 @@ import (
"sync"
"time"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func init() {


+ 2
- 2
modules/caddyhttp/caddyauth/caddyauth.go View File

@ -18,8 +18,8 @@ import (
"fmt"
"net/http"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"go.uber.org/zap"
)


+ 4
- 4
modules/caddyhttp/caddyauth/caddyfile.go View File

@ -15,10 +15,10 @@
package caddyauth
import (
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 2
- 2
modules/caddyhttp/caddyauth/command.go View File

@ -23,8 +23,8 @@ import (
"os"
"os/signal"
"github.com/caddyserver/caddy/v2"
caddycmd "github.com/caddyserver/caddy/v2/cmd"
"git.sequentialread.com/forest/caddy/v2"
caddycmd "git.sequentialread.com/forest/caddy/v2/cmd"
"golang.org/x/term"
)


+ 1
- 1
modules/caddyhttp/caddyauth/hashes.go View File

@ -17,7 +17,7 @@ package caddyauth
import (
"crypto/subtle"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
"golang.org/x/crypto/bcrypt"
"golang.org/x/crypto/scrypt"
)


+ 2
- 2
modules/caddyhttp/caddyhttp.go View File

@ -22,8 +22,8 @@ import (
"net/http"
"strconv"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
)
func init() {


+ 2
- 2
modules/caddyhttp/celmatcher.go View File

@ -24,8 +24,8 @@ import (
"strings"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"github.com/google/cel-go/cel"
"github.com/google/cel-go/checker/decls"
"github.com/google/cel-go/common/types"


+ 1
- 1
modules/caddyhttp/celmatcher_test.go View File

@ -22,7 +22,7 @@ import (
"net/http/httptest"
"testing"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func TestMatchExpressionProvision(t *testing.T) {


+ 2
- 2
modules/caddyhttp/encode/brotli/brotli_precompressed.go View File

@ -1,8 +1,8 @@
package caddybrotli
import (
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/encode"
)
func init() {


+ 5
- 5
modules/caddyhttp/encode/caddyfile.go View File

@ -19,11 +19,11 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 2
- 2
modules/caddyhttp/encode/encode.go View File

@ -30,8 +30,8 @@ import (
"strings"
"sync"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 3
- 3
modules/caddyhttp/encode/gzip/gzip.go View File

@ -19,9 +19,9 @@ import (
"fmt"
"strconv"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/encode"
"github.com/klauspost/compress/gzip"
)


+ 2
- 2
modules/caddyhttp/encode/gzip/gzip_precompressed.go View File

@ -1,8 +1,8 @@
package caddygzip
import (
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/encode"
)
func init() {


+ 3
- 3
modules/caddyhttp/encode/zstd/zstd.go View File

@ -15,9 +15,9 @@
package caddyzstd
import (
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/encode"
"github.com/klauspost/compress/zstd"
)


+ 2
- 2
modules/caddyhttp/encode/zstd/zstd_precompressed.go View File

@ -1,8 +1,8 @@
package caddyzstd
import (
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/encode"
)
func init() {


+ 1
- 1
modules/caddyhttp/errors.go View File

@ -22,7 +22,7 @@ import (
"strings"
"time"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func init() {


+ 2
- 2
modules/caddyhttp/fileserver/browse.go View File

@ -23,8 +23,8 @@ import (
"path"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"go.uber.org/zap"
)


+ 1
- 1
modules/caddyhttp/fileserver/browse_test.go View File

@ -4,7 +4,7 @@ import (
"html/template"
"testing"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func BenchmarkBrowseWriteJSON(b *testing.B) {


+ 1
- 1
modules/caddyhttp/fileserver/browselisting.go View File

@ -23,7 +23,7 @@ import (
"strings"
"time"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
"github.com/dustin/go-humanize"
)


+ 6
- 6
modules/caddyhttp/fileserver/caddyfile.go View File

@ -18,12 +18,12 @@ import (
"path/filepath"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/encode"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/rewrite"
)
func init() {


+ 5
- 5
modules/caddyhttp/fileserver/command.go View File

@ -21,11 +21,11 @@ import (
"strconv"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
caddycmd "github.com/caddyserver/caddy/v2/cmd"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
caddytpl "github.com/caddyserver/caddy/v2/modules/caddyhttp/templates"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
caddycmd "git.sequentialread.com/forest/caddy/v2/cmd"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
caddytpl "git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/templates"
"github.com/caddyserver/certmagic"
)


+ 3
- 3
modules/caddyhttp/fileserver/matcher.go View File

@ -22,9 +22,9 @@ import (
"strings"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 2
- 2
modules/caddyhttp/fileserver/matcher_test.go View File

@ -19,7 +19,7 @@ import (
"net/url"
"testing"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func TestFileMatcher(t *testing.T) {
@ -159,7 +159,7 @@ func TestPHPFileMatcher(t *testing.T) {
matched: true,
},
{
// See https://github.com/caddyserver/caddy/issues/3623
// See https://git.sequentialread.com/forest/caddy/issues/3623
path: "/%E2%C3",
expectedPath: "/%E2%C3",
expectedType: "file",


+ 4
- 4
modules/caddyhttp/fileserver/staticfiles.go View File

@ -29,9 +29,9 @@ import (
"sync"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/encode"
"go.uber.org/zap"
)
@ -260,7 +260,7 @@ func (fsrv *FileServer) ServeHTTP(w http.ResponseWriter, r *http.Request, next c
// if URL canonicalization is enabled, we need to enforce trailing
// slash convention: if a directory, trailing slash; if a file, no
// trailing slash - not enforcing this can break relative hrefs
// in HTML (see https://github.com/caddyserver/caddy/issues/2741)
// in HTML (see https://git.sequentialread.com/forest/caddy/issues/2741)
if fsrv.CanonicalURIs == nil || *fsrv.CanonicalURIs {
if implicitIndexFile && !strings.HasSuffix(r.URL.Path, "/") {
fsrv.logger.Debug("redirecting to canonical URI (adding trailing slash for directory)", zap.String("path", r.URL.Path))


+ 2
- 2
modules/caddyhttp/headers/caddyfile.go View File

@ -20,8 +20,8 @@ import (
"reflect"
"strings"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 2
- 2
modules/caddyhttp/headers/headers.go View File

@ -20,8 +20,8 @@ import (
"regexp"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 2
- 2
modules/caddyhttp/headers/headers_test.go View File

@ -22,8 +22,8 @@ import (
"reflect"
"testing"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func TestHandler(t *testing.T) {


+ 2
- 2
modules/caddyhttp/map/caddyfile.go View File

@ -17,8 +17,8 @@ package maphandler
import (
"strings"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 2
- 2
modules/caddyhttp/map/map.go View File

@ -20,8 +20,8 @@ import (
"regexp"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 2
- 2
modules/caddyhttp/matchers.go View File

@ -26,8 +26,8 @@ import (
"sort"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"go.uber.org/zap"
)


+ 1
- 1
modules/caddyhttp/matchers_test.go View File

@ -23,7 +23,7 @@ import (
"os"
"testing"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func TestHostMatcher(t *testing.T) {


+ 3
- 3
modules/caddyhttp/push/caddyfile.go View File

@ -15,9 +15,9 @@
package push
import (
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/headers"
)
func init() {


+ 3
- 3
modules/caddyhttp/push/handler.go View File

@ -19,9 +19,9 @@ import (
"net/http"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/headers"
"go.uber.org/zap"
)


+ 2
- 2
modules/caddyhttp/replacer.go View File

@ -38,8 +38,8 @@ import (
"strings"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddytls"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddytls"
)
// NewTestReplacer creates a replacer for an http.Request


+ 1
- 1
modules/caddyhttp/replacer_test.go View File

@ -23,7 +23,7 @@ import (
"net/http/httptest"
"testing"
"github.com/caddyserver/caddy/v2"
"git.sequentialread.com/forest/caddy/v2"
)
func TestHTTPVarReplacement(t *testing.T) {


+ 2
- 2
modules/caddyhttp/requestbody/caddyfile.go View File

@ -15,8 +15,8 @@
package requestbody
import (
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"github.com/dustin/go-humanize"
)


+ 2
- 2
modules/caddyhttp/requestbody/requestbody.go View File

@ -17,8 +17,8 @@ package requestbody
import (
"net/http"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
)
func init() {


+ 1
- 1
modules/caddyhttp/responsewriter.go View File

@ -124,7 +124,7 @@ type responseRecorder struct {
// The header map is not buffered; i.e. the ResponseRecorder's Header()
// method returns the same header map of the underlying ResponseWriter.
// This is a crucial design decision to allow HTTP trailers to be
// flushed properly (https://github.com/caddyserver/caddy/issues/3236).
// flushed properly (https://git.sequentialread.com/forest/caddy/issues/3236).
//
// Once you are ready to write the response, there are two ways you can
// do it. The easier way is to have the recorder do it:


+ 6
- 6
modules/caddyhttp/reverseproxy/caddyfile.go View File

@ -23,12 +23,12 @@ import (
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/caddyfile"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/headers"
"github.com/dustin/go-humanize"
)


+ 6
- 6
modules/caddyhttp/reverseproxy/command.go View File

@ -22,12 +22,12 @@ import (
"net/http"
"strconv"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
caddycmd "github.com/caddyserver/caddy/v2/cmd"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"
"git.sequentialread.com/forest/caddy/v2"
"git.sequentialread.com/forest/caddy/v2/caddyconfig"
"git.sequentialread.com/forest/caddy/v2/caddyconfig/httpcaddyfile"
caddycmd "git.sequentialread.com/forest/caddy/v2/cmd"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp"
"git.sequentialread.com/forest/caddy/v2/modules/caddyhttp/headers"
)
func init() {


+ 8
- 8
modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go View File

@ -19,14 +19,14 @@ import (
"net/http"
"strconv"