diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-18 11:40:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-18 11:40:19 -0400 |
| commit | 5df475c81398b42fa0fa3f710d7268d15ae920ae (patch) | |
| tree | 072f82cb29eaa3442e632544073affff2d7812e4 | |
| parent | a9eb75d1207f7cd5ada02c530cd576c03e48410e (diff) | |
| parent | 1c5d01e7e600646678c32d192ca19b21493410c9 (diff) | |
| download | ikiwiki-5df475c81398b42fa0fa3f710d7268d15ae920ae.tar ikiwiki-5df475c81398b42fa0fa3f710d7268d15ae920ae.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
4 files changed, 53 insertions, 1 deletions
diff --git a/doc/bugs/openid_login_fails_wirth_Could_not_determine_ID_provider_from_URL.mdwn b/doc/bugs/openid_login_fails_wirth_Could_not_determine_ID_provider_from_URL.mdwn index 4b506ae5b..b81dd78cd 100644 --- a/doc/bugs/openid_login_fails_wirth_Could_not_determine_ID_provider_from_URL.mdwn +++ b/doc/bugs/openid_login_fails_wirth_Could_not_determine_ID_provider_from_URL.mdwn @@ -149,3 +149,24 @@ Workaround - disable error checking: } else { ~~~~ + +> I get the same trouble with OpenID and some locally installed versions of IkiWiki on Debian wheezy (server) as well as on 13.10 Ubuntu (laptop). To be precise I hit the *other* bug in LWP: [#738493](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738493). +> +> My only workaround for now was to fix `PERL_LWP_SSL_VERIFY_HOSTNAME` to 0 directly in `ikiwiki` :-( -- [[users/bbb]] + +~~~~ +*** /home/bruno/opt/ikiwiki/bin/ikiwiki.bad 2014-04-17 15:41:38.868972152 +0200 +--- /home/bruno/opt/ikiwiki/bin/ikiwiki 2014-04-17 15:04:56.524996905 +0200 +*************** sub main () { +*** 226,229 **** + } + } + +! main; +--- 226,229 ---- + } + } + +! $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0 ; main; +~~~~ + diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 89fa9ca8e..289f9c763 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -5,7 +5,7 @@ What about [[this page]]? hello world (right back at ya) -test +test, is it being saved? > This is a blockquote. > diff --git a/doc/todo/concatenating_or_compiling_CSS.mdwn b/doc/todo/concatenating_or_compiling_CSS.mdwn index e0715e730..d73a7c921 100644 --- a/doc/todo/concatenating_or_compiling_CSS.mdwn +++ b/doc/todo/concatenating_or_compiling_CSS.mdwn @@ -123,3 +123,31 @@ this without that feature initially. > > -- [[Louis|spalax]] +>> One big request is more efficient than lots of small requests, +>> if we model the CSS as all changing equally infrequently. +>> In terms of bytes, each file needs some code in the HTML `<head>`, +>> plus the HTTP request and response headers, plus the actual file. +>> On the first page-view, a visitor will have to download all the CSS anyway +>> (one request/response pair per CSS file). On subsequent page-views, there +>> will be one request/"304 Not Modified" response per CSS file, unless the +>> CSS files can be marked "to be cached forever" (which can be done if +>> they have content-based filenames). +>> +>> In terms of time, [[!wikipedia HTTP_pipelining desc="according to Wikipedia"]] +>> browsers don't generally pipeline requests, so the page won't finish +>> loading until one round-trip time per uncached CSS file has elapsed. +>> +>> Having lots of small files with content-based filenames would be the +>> next best thing - not particularly efficient on a generic web server, +>> but they could at least be marked as "cache forever" in server +>> configuration. I'd be OK with doing that if it makes ikiwiki more +>> maintainable, but I don't think concatenating all the CSS at +>> compile time is actually going to be a problem in practice. +>> The individual small files are still going to be available +>> for the wiki operator to edit. +>> +>> If some CSS files change with a significantly different frequency, +>> *then* it might become worthwhile to separate them, but I don't +>> think that's the case (apart from possibly local.css, which is why +>> I'm not sure whether to include it in this). +>> --smcv diff --git a/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn b/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn new file mode 100644 index 000000000..c8bbaa157 --- /dev/null +++ b/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn @@ -0,0 +1,3 @@ +i'm trying to work on the decentralised wikis documentation in [[tips/distributed_wikis]] and i would like to add more / edit SVG graphics, but I can't because i'm not admin. --[[users/anarcat]] + +[[!template id=gitbranch branch=anarcat/dev/decentralised_graphics author="[[anarcat]]"]] |