Skip to content

Commit

Permalink
doc: update
Browse files Browse the repository at this point in the history
  • Loading branch information
fatedier committed Jul 1, 2017
1 parent 7bb8c10 commit fe32a7c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,14 @@ Configure frps same as above.
[http_proxy]
type = tcp
remote_port = 6000
plugin = http_proxy
plugin = http_proxy # or socks5
```

4. Start frpc:

`./frpc -c ./frpc.ini`

5. Set http proxy `x.x.x.x:6000` in your browser and visit website through frpc's network.
5. Set http proxy or socks5 proxy `x.x.x.x:6000` in your browser and visit website through frpc's network.

## Features

Expand Down Expand Up @@ -469,7 +469,7 @@ http_proxy = http://user:[email protected]:8080

frpc only forward request to local tcp or udp port by default.

Plugin is used for providing rich features. There are built-in plugins such as **unix_domain_socket**, **http_proxy** and you can see [example usage](#example-usage).
Plugin is used for providing rich features. There are built-in plugins such as **unix_domain_socket**, **http_proxy**, **socks5** and you can see [example usage](#example-usage).

Specify which plugin to use by `plugin` parameter. Configuration parameters of plugin should be started with `plugin_`. `local_ip` and `local_port` is useless for plugin.

Expand Down
8 changes: 4 additions & 4 deletions README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,11 @@ DNS 查询请求通常使用 UDP 协议,frp 支持对内网 UDP 服务的穿

### 通过 frpc 所在机器访问外网

frpc 内置了 http proxy 插件,可以使其他机器通过 frpc 的网络访问互联网。
frpc 内置了 http proxy 和 socks5 插件,可以使其他机器通过 frpc 的网络访问互联网。

frps 的部署步骤同上。

1. 修改 frpc.ini 文件,启用 http_proxy 插件
1. 修改 frpc.ini 文件,启用 http_proxy 或 socks5 插件(plugin 换为 socks5 即可)

```ini
# frpc.ini
Expand All @@ -247,7 +247,7 @@ frps 的部署步骤同上。

`./frpc -c ./frpc.ini`

5. 浏览器设置 http 代理地址为 `x.x.x.x:6000`,通过 frpc 机器的网络访问互联网。
5. 浏览器设置 http 或 socks5 代理地址为 `x.x.x.x:6000`,通过 frpc 机器的网络访问互联网。

## 功能说明

Expand Down Expand Up @@ -486,7 +486,7 @@ http_proxy = http://user:[email protected]:8080

默认情况下,frpc 只会转发请求到本地 tcp 或 udp 端口。

插件模式是为了在客户端提供更加丰富的功能,目前内置的插件有 **unix_domain_socket****http_proxy**。具体使用方式请查看[使用示例](#使用示例)
插件模式是为了在客户端提供更加丰富的功能,目前内置的插件有 **unix_domain_socket****http_proxy****socks5**。具体使用方式请查看[使用示例](#使用示例)

通过 `plugin` 指定需要使用的插件,插件的配置参数都以 `plugin_` 开头。使用插件后 `local_ip` 和 `local_port 不再需要配置。

Expand Down

0 comments on commit fe32a7c

Please sign in to comment.