Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

new readthedocs.io domain - #4690

Closed
patryk wants to merge 3 commits into
EFForg:masterfrom
patryk:patch-1
Closed

patryk wants to merge 3 commits into
EFForg:masterfrom
patryk:patch-1

Conversation

@patryk

@patryk patryk commented Apr 28, 2016

Copy link
Copy Markdown
Contributor

No description provided.

<securecookie host="^readthedocs\.io" name=".+" />

<rule from="^https?://(.+\.)?rtfd\.org/" to="https://$1readthedocs.org/" />
<rule from="^https?://(.+\.)?rtfd\.org/" to="https://$1readthedocs.io/" />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be changed to:

<rule from="^http://(.+\.)?rtfd\.org/" to="https://$1readthedocs.io/" />

See #1327

@patryk

patryk commented Apr 30, 2016

Copy link
Copy Markdown
Contributor Author

I am not entirely sure what is CI check moaning about. Any hints?

@fuzzyroddis

Copy link
Copy Markdown
Contributor
failure: /home/travis/build/EFForg/https-everywhere/utils/../src/chrome/content/rules/ReadTheDocs.xml failed test: The 'from' rule contains unescaped period in regular expression.  Try escaping it with a backslash.
ERROR: Validation of rulesets failed.

I think it has to do with https://github.com/patryk/https-everywhere/blob/patch-1/src/chrome/content/rules/ReadTheDocs.xml#L33

Try:
<rule from="^http://([\w-]+\.)?rtfd\.org/" to="https://$1readthedocs.io/" />

https://github.com/EFForg/https-everywhere/blob/375124aa311c82db8c87c1882c41b082da4b84a4/ruleset-testing.md#example

@patryk

patryk commented May 5, 2016

Copy link
Copy Markdown
Contributor Author

@fuzzyroddis: Do you want me to squash PR first, or you will do it during merging (I believe GitHub supports it in UI)?

@fuzzyroddis

Copy link
Copy Markdown
Contributor

I am just a contributor, not officially part of the HTTPS Everywhere project.

<securecookie host="^readthedocs\.io" name=".+" />

<rule from="^https?://(.+\.)?rtfd\.org/" to="https://$1readthedocs.org/" />
<rule from="^http://([\w-]+\.)?rtfd\.org/" to="https://$1readthedocs.io/" />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is obsolete with the generic redirect below.

@fuzzyroddis fuzzyroddis May 12, 2016 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly rtfd.org does not support HTTPS however, so we need to redirect straight to https://$1readthedocs.io

@fuzzyroddis

fuzzyroddis commented May 12, 2016 •

Copy link
Copy Markdown
Contributor

readthedocs.com looks different from readthedocs.org are they by the same people?
Edit: they are

@J0WI

J0WI commented Aug 21, 2016

Copy link
Copy Markdown
Contributor

Feedback has been addressed in #6242

@J0WI J0WI closed this Aug 21, 2016
J0WI pushed a commit that referenced this pull request Aug 21, 2016
…) (#6242)

* new readthedocs.io domain

* Remove HTTP/HTTPS redirects in line with #1327

* Fix for regex in readthedocs.io

* [Read the Docs] Add tests, other minor updates.

* Add tests

* Expand <securecookie> coverage

* Fix missing `$` in a <securecookie>

* Move some tests around

* Update comments

* [Read the Docs] Fix the comment right this time
@patryk
patryk deleted the patch-1 branch August 21, 2016 14:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants