diff options
| author | Joey Hess <joey@kitenet.net> | 2011-06-14 16:28:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-14 16:28:09 -0400 |
| commit | c4154e8a45615ab99f22aa2cfe42788f1ce974cc (patch) | |
| tree | aad767a31fac3fd53e4b9899566b18cc5d1a5970 | |
| parent | 38dd85c7994049e4594df1f395ca7bde3dee8895 (diff) | |
| parent | 56370d3ac77c969d8d72d161f6b20e4b295939a2 (diff) | |
| download | ikiwiki-c4154e8a45615ab99f22aa2cfe42788f1ce974cc.tar ikiwiki-c4154e8a45615ab99f22aa2cfe42788f1ce974cc.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
| -rw-r--r-- | doc/bugs/http_proxy_for_openid.mdwn | 17 | ||||
| -rw-r--r-- | doc/plugins/txt.mdwn | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn index dc8423e46..b7ae76aeb 100644 --- a/doc/bugs/http_proxy_for_openid.mdwn +++ b/doc/bugs/http_proxy_for_openid.mdwn @@ -61,3 +61,20 @@ Brian May >> Use $ua->env_proxy() to get it to read the environment variables. Then http:// does work. >> >> Unfortunately this breaks https:// even more - but nothing I do seems to make https:// work anymore. + + +>>> LWP::UserAgent defaults to not caring about proxy settings in +>>> the environment. (To give control over the result, I guess?) +>>> To get it to care, pass `env_proxy => 1` to the constructor. Affected +>>> plugins: aggregate, openid, pinger. This probably wants to be on +>>> by default, and might not need to be configurable. --[[schmonz]] + +>>>> Okay, in a real-world scenario it does need to be +>>>> configurable. A working implementation (tested with aggregate, +>>>> not tested with the other two plugins) is in my git, commit +>>>> 91c46819dee237a281909b0c7e65718eb43f4119. --[[schmonz]] + +>>>>> Oh, and according to the LWPx::ParanoidAgent docs, "proxy support is +>>>>> explicitly removed", so if ikiwiki can preferentially find that +>>>>> installed, even with the above commit, `openid` won't be able to +>>>>> traverse a proxy. --[[schmonz]] diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn index a3087c9e0..a51aabf48 100644 --- a/doc/plugins/txt.mdwn +++ b/doc/plugins/txt.mdwn @@ -5,8 +5,8 @@ This plugin makes ikiwiki treat files with names ending in ".txt" as wiki pages. Unlike other [[type/format]] plugins, no formatting of markup in -txt files is done; the file contents is displayed to the user as-is, -with html markup characters such as ">" escaped. +txt files is done; the file contents is displayed to the user as +pre-formatted text, with html markup characters such as ">" escaped. The only exceptions are that [[WikiLinks|ikiwiki/WikiLink]] and [[directives|ikiwiki/directive]] are still expanded by |