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.

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

Update PAC to handle user rules in a better way #2196

Merged
merged 2 commits into from
Feb 11, 2019

Conversation

celeron533
Copy link
Contributor

Please follow the guide below

  • You will be asked some questions, please read them carefully and answer honestly

  • Put an x into all the boxes [ ] relevant to your pull request (like that [x])

  • Use Preview tab to see how your pull request will actually look like

  • Searched for similar pull requests

  • Compiled the code with Visual Studio

What is the purpose of your pull request?

  • Bug fix
  • Improvement
  • New feature

Description of your pull request and other information

  • Update the PAC javascript to support user rules in a better way: PAC will check the user rules first to find whether the URL should be connected via PROXY or DIRECT. If it does not match, then go to check GFWList rules.
  • Update the embedded PAC file with updated PAC template and latest gfwlist

@chenshaoju
Copy link
Collaborator

Test failed, Base AppVeyor 4.1.4.6 version, On Windows 7 & Windows 10.

---------------------------
Shadowsocks non-UI Error
---------------------------
非预期错误,Shadowsocks将退出。请提交此错误到 https://github.com/shadowsocks/shadowsocks-windows/issues  System.TypeInitializationException: “Shadowsocks.Controller.AvailabilityStatistics”的类型初始值设定项引发异常。 ---> System.IO.FileNotFoundException: 未能加载文件或程序集“Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed”或它的某一个依赖项。系统找不到指定的文件。    在 Shadowsocks.Model.Configuration.Load()    在 Shadowsocks.Util.Utils.GetTempPath()    在 Shadowsocks.Util.Utils.GetTempPath(String filename)    在 Shadowsocks.Controller.AvailabilityStatistics..cctor()    --- 内部异常堆栈跟踪的结尾 ---    在 Shadowsocks.Controller.AvailabilityStatistics.get_Instance()    在 Shadowsocks.Controller.ShadowsocksController..ctor()    在 Shadowsocks.Program.Main(String[] args)
---------------------------
确定   
---------------------------

@ghost
Copy link

ghost commented Feb 11, 2019

有点意思,修PAC炸统计

@celeron533
Copy link
Contributor Author

有点意思,修PAC炸统计

西边不亮东边亮

@celeron533
Copy link
Contributor Author

celeron533 commented Feb 11, 2019

非预期错误,Shadowsocks将退出。
请提交此错误到 https://github.com/shadowsocks/shadowsocks-windows/issues  System.TypeInitializationException: 
“Shadowsocks.Controller.AvailabilityStatistics”的类型初始值设定项引发异常。 
---> System.IO.FileNotFoundException: 未能加载文件或程序集“Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed”或它的某一个依赖项。系统找不到指定的文件。
    在 Shadowsocks.Model.Configuration.Load()
    在 Shadowsocks.Util.Utils.GetTempPath()
    在 Shadowsocks.Util.Utils.GetTempPath(String filename)
    在 Shadowsocks.Controller.AvailabilityStatistics..cctor()
    --- 内部异常堆栈跟踪的结尾 ---
    在 Shadowsocks.Controller.AvailabilityStatistics.get_Instance()
    在 Shadowsocks.Controller.ShadowsocksController..ctor()
    在 Shadowsocks.Program.Main(String[] args)

在这个 pull request 之前有更新过所有的nuget包。
7194f5a

引发错误的具体操作过程是?
下了那个版本,双击直接爆。。。怀疑是appveyor那里的锅

@chenshaoju
Copy link
Collaborator

目前没编译环境,有环境了我测试一下。

PAC will check the user rules first to find whether the URL should be connected via PROXY or DIRECT. If it does not match, then go to check GFWList rules.
@chenshaoju
Copy link
Collaborator

Base AppVeyor 4.1.4.9 version test has passed, On Windows 7 & Windows 10.

@celeron533
Copy link
Contributor Author

Issue is caused by upgrading the nuget packages. Solved in fcef17a

@celeron533 celeron533 mentioned this pull request Feb 11, 2019
5 tasks
@celeron533 celeron533 merged commit 0cb9158 into shadowsocks:master Feb 11, 2019
@celeron533 celeron533 deleted the pac_user_rules branch July 10, 2019 05:18
@leosin
Copy link

leosin commented Feb 11, 2020

在v2r下面也是同样遇到这样的问题,fonts.googleapis.com即使在user-rule里面声明了,依然无效,查了下载回来的pac里面确实有@@fonts....这个。目前有什么办法解决吗

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants