Skip to content

Commit

Permalink
fix some typo (#1113)
Browse files Browse the repository at this point in the history
Signed-off-by: cui fliter <imcusg@gmail.com>
  • Loading branch information
cuishuang committed Sep 29, 2023
1 parent a7f111e commit 0441fde
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 21 deletions.
2 changes: 1 addition & 1 deletion bfe_config/bfe_conf/testdata/conf_https_basic/bfe_4.conf
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ cipherSuites=TLS_RSA_WITH_AES_256_CBC_SHA
cipherSuites=TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
cipherSuites=TLS_RSA_WITH_3DES_EDE_CBC_SHA

# supported curve perference settings
# supported curve preference settings
# support curves: CurveP256, CurveP384, CurveP521
curvePreferences=CurveP256

Expand Down
7 changes: 2 additions & 5 deletions bfe_http2/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,13 @@ import (
"strings"
"sync"
"time"
)

import (
"github.com/baidu/go-lib/gotrack"
"github.com/baidu/go-lib/log"
)

import (
http "github.com/bfenetworks/bfe/bfe_http"
"github.com/bfenetworks/bfe/bfe_http2/hpack"

tls "github.com/bfenetworks/bfe/bfe_tls"
"github.com/bfenetworks/bfe/bfe_util/pipe"
)
Expand Down Expand Up @@ -890,7 +887,7 @@ func (sc *serverConn) serve() {
if !sc.processFrameFromReader(res) {
return
}
// collect HTTP/2 fingerprint infomation.
// collect HTTP/2 fingerprint information.
sc.fingerprint.ProcessFrame(res)
res.readMore()
if settingsTimer.C != nil {
Expand Down
2 changes: 1 addition & 1 deletion conf/bfe.conf
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ CipherSuites=TLS_RSA_WITH_RC4_128_SHA
CipherSuites=TLS_RSA_WITH_AES_128_CBC_SHA
CipherSuites=TLS_RSA_WITH_AES_256_CBC_SHA

# supported curve perference settings
# supported curve preference settings
#
# curves implemented in golang:
# CurveP256
Expand Down
4 changes: 2 additions & 2 deletions docs/en_us/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* [About](ABOUT.md)
* Introduction
* [Overview](introduction/overview.md)
* [Comparsion to similar systems](introduction/comparison.md)
* [Comparison to similar systems](introduction/comparison.md)
* Design overview
* [Terminology](introduction/terminology.md)
* [Traffic fowarding model](introduction/forward_model.md)
Expand All @@ -18,7 +18,7 @@
* [Traffic blocking](example/block.md)
* [Request redirect](example/redirect.md)
* [Request rewrite](example/rewrite.md)
* [FastCGI procotol](example/fastcgi.md)
* [FastCGI protocol](example/fastcgi.md)
* [TLS mutual authentication](example/client_auth.md)
* [Installation](installation/install.md)
* [Install from source](installation/install_from_source.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/en_us/condition/condition_grammar.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ req_host_in("bfe-networks.com") && req_method_in("GET")
- You can define a variable and assign a condition expression to it.

```go
// define a condition varaible
// define a condition variable
bfe_host = req_host_in("bfe-networks.com")
```

Expand Down
2 changes: 1 addition & 1 deletion docs/en_us/condition/system/time.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ bfe_time_range("20190204203000H", "20190204204500H")
| --------- | ---------- |
| start_time | String<br>start time |
| end_time | String<br> end time |
| period | String<br> period, defualt *Day* |
| period | String<br> period, default *Day* |

Time format: hhmmssZ,Z is time zone,detail information is shown in "Appendix B: Time Zone Detail"

Expand Down
6 changes: 3 additions & 3 deletions docs/en_us/configuration/bfe.conf.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bfe.conf is the core configuration file of BFE.
| Basic.KeepAliveEnabled | Boolean<br>If false, HTTP Keep-Alive is disabled<br>Default True |
| Basic.GracefulShutdownTimeout | Integer<br>Timeout for graceful shutdown (maximum 300 sec)<br>Default 10 |
| Basic.MaxHeaderBytes | Integer<br>Max length of request header, in bytes<br>Default 10485 |
| Basic.MaxHeaderUriBytes | Integer<br>Max lenght of request URI, in bytes<br>Default 8192 |
| Basic.MaxHeaderUriBytes | Integer<br>Max length of request URI, in bytes<br>Default 8192 |
| Basic.HostRuleConf | String<br>Path of [host config](server_data_conf/host_rule.data.md)<br>Default server_data_conf/host_rule.data |
| Basic.VipRuleConf | String<br>Path of [VIP config](server_data_conf/vip_rule.data.md)<br>Default server_data_conf/vip_rule.data |
| Basic.RouteRuleConf | String<br>Path of [route rule config](server_data_conf/route_rule.data.md)<br>Default server_data_conf/route_rule.data |
Expand All @@ -44,7 +44,7 @@ bfe.conf is the core configuration file of BFE.
| HttpsBasic.ServerCertConf | String<br>Path of [cert config](tls_conf/server_cert_conf.data.md)<br>Default tls_conf/server_cert_conf.data |
| HttpsBasic.TlsRuleConf | String<br>Path of [tls rule config](tls_conf/tls_rule_conf.data.md)<br>Default tls_conf/tls_rule_conf.data |
| HttpsBasic.CipherSuites | String<br>CipherSuites preference settings<br>Default |
| HttpsBasic.CurvePreferences | String<br>Curve perference settings<br>Default CurveP256 |
| HttpsBasic.CurvePreferences | String<br>Curve preference settings<br>Default CurveP256 |
| HttpsBasic.EnableSslv2ClientHello | Boolean<br>Enable Sslv2ClientHello for compatible with ancient sslv3 client<br>Default True |
| HttpsBasic.ClientCABaseDir | String<br>Base directory of client ca certificates <br>Note: filename suffix of ca certificate must be ".crt"<br>Default tls_conf/client_ca |
| SessioCache.SessionCacheDisabled | Boolean<br>Disable tls session cache or not<br>Default True |
Expand Down Expand Up @@ -166,7 +166,7 @@ CipherSuites=TLS_RSA_WITH_RC4_128_SHA
CipherSuites=TLS_RSA_WITH_AES_128_CBC_SHA
CipherSuites=TLS_RSA_WITH_AES_256_CBC_SHA

# supported curve perference settings
# supported curve preference settings
#
# curves implemented in golang:
# CurveP256
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cluster_table.data records the load balancing config among instances.
| Config{v}{k} | String<br>name of subcluster |
| Config{v}{v} | Object<br>config of subcluster(a list of instance) |

### Instance configuraton
### Instance configuration

| Config Item | Description |
| --------------------- | ------------------------------- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BackendConf is config for backend.
| MaxIdleConnsPerHost | Int<br>Max idle connections to each backend per BFE. Default value is 2. |
| MaxConnsPerHost | Int<br>Max number of concurrent connections to each backend per BFE. 0 means no limitation. Default value is 0. |
| RetryLevel | Int<br>Retry level if request fail. 0: retry after connecting backend fails; 1: retry after connecting backend fails or forwarding GET request fails. Default value is 0. |
| BackendConf.OutlierDetectionHttpCode | String<br>Backend HTTP status code outlier detection. <br>"" means disable detection, "500" means "500" is considered as backend failure. <br>Supports two formats: "\[0-9\]{3}"(e.g "500"), and "\[0-9\]xx"(e.g "4xx"). Multiple status codes are seperated by "\|".<br>Default value is "", which means disable the detection. |
| BackendConf.OutlierDetectionHttpCode | String<br>Backend HTTP status code outlier detection. <br>"" means disable detection, "500" means "500" is considered as backend failure. <br>Supports two formats: "\[0-9\]{3}"(e.g "500"), and "\[0-9\]xx"(e.g "4xx"). Multiple status codes are separated by "\|".<br>Default value is "", which means disable the detection. |
| FCGIConf | Object<br>Conf for FastCGI Protocol |
| FCGIConf.Root | String<br>The root folder of the website |
| FCGIConf.EnvVars | Map\[string\]string<br>Extra environment variable |
Expand Down
2 changes: 1 addition & 1 deletion docs/en_us/example/redirect.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ DataPath = mod_redirect/redirect.data
curl -H "host: example.org" "http://127.1:8080/test"
```

The repsonse stuatus code should be 301, and the value of Location response Header should be "https://example.org/test".
The response stuatus code should be 301, and the value of Location response Header should be "https://example.org/test".
2 changes: 1 addition & 1 deletion docs/en_us/operation/api.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Management API

BFE provides a set of management APIs for metrics exposing, configruation reloading, debugging and profiling etc. It should not publicly exposing the APIs, keeping them restricted to internal networks.
BFE provides a set of management APIs for metrics exposing, configurations reloading, debugging and profiling etc. It should not publicly exposing the APIs, keeping them restricted to internal networks.

## Configuration

Expand Down
2 changes: 1 addition & 1 deletion docs/en_us/operation/command.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Display verbose version information and exit. By default, this flag is set false

* -h

Display help infomation and exit. By default, this flag is set false.
Display help information and exit. By default, this flag is set false.
2 changes: 1 addition & 1 deletion docs/mkdocs_en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ nav:
- 'About': 'ABOUT.md'
- 'Introduction':
- 'Overview': 'introduction/overview.md'
- 'Comparsion to similar systems': 'introduction/comparison.md'
- 'Comparison to similar systems': 'introduction/comparison.md'
- 'Design overview':
- 'Terminology': 'introduction/terminology.md'
- 'Traffic fowarding model': 'introduction/forward_model.md'
Expand Down
2 changes: 1 addition & 1 deletion docs/zh_cn/configuration/bfe.conf.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ CipherSuites=TLS_RSA_WITH_RC4_128_SHA
CipherSuites=TLS_RSA_WITH_AES_128_CBC_SHA
CipherSuites=TLS_RSA_WITH_AES_256_CBC_SHA

# supported curve perference settings
# supported curve preference settings
#
# curves implemented in golang:
# CurveP256
Expand Down

0 comments on commit 0441fde

Please sign in to comment.