user/sven/git.git/gitweb, branch v1.7.7.4

Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint

2011-11-09T00:26:50Z

* jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks

Merge branch 'jn/gitweb-highlite-sanitise' into maint

2011-10-26T23:13:31Z

* jn/gitweb-highlite-sanitise: gitweb: Strip non-printable characters from syntax highlighter output

Merge branch 'maint-1.7.6' into maint

2011-10-26T23:13:27Z

* maint-1.7.6: notes_merge_commit(): do not pass temporary buffer to other function gitweb: Fix links to lines in blobs when javascript-actions are enabled mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files t9159-*.sh: skip for mergeinfo test for svn <= 1.4 date.c: Support iso8601 timezone formats remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote'

Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6

2011-10-26T23:12:35Z

* ps/gitweb-js-with-lineno: gitweb: Fix links to lines in blobs when javascript-actions are enabled

gitweb: fix regression when filtering out forks

2011-10-21T21:46:38Z

This fixes a condition in filter_forks_from_projects_list that failed if process directory was different from project root: in such case, the subroutine was a no-op and forks were not detected. Signed-off-by: Julien Muchembled Tested-by: Jakub Narebski Signed-off-by: Junio C Hamano

gitweb: Fix links to lines in blobs when javascript-actions are enabled

2011-09-27T16:34:37Z

The fixLinks() function adds 'js=1' to each link that does not already have 'js' query parameter specified. This is used to signal to gitweb that the browser can actually do javascript when these links are used. There are two problems with the existing code: 1. URIs with fragment and 'js' query parameter, like e.g. ...foo?js=0#l199 were not recognized as having 'js' query parameter already. 2. The 'js' query parameter, in the form of either '?js=1' or ';js=1' was appended at the end of URI, even if it included a fragment (had a hash part). This lead to the incorrect links like this ...foo#l199?js=1 instead of adding query parameter as last part of query, but before the fragment part, i.e. ...foo?js=1#l199 Signed-off-by: Peter Stuge Acked-by: Jakub Narebski Signed-off-by: Junio C Hamano

gitweb: Strip non-printable characters from syntax highlighter output

2011-09-16T16:22:47Z

The current code, as is, passes control characters, such as form-feed (^L) to highlight which then passes it through to the browser. User agents (web browsers) that support 'application/xhtml+xml' usually require that web pages declared as XHTML and with this mimetype are well-formed XML. Unescaped control characters cannot appear within a contents of a valid XML document. This will cause the browser to display one of the following warnings: * Safari v5.1 (6534.50) & Google Chrome v13.0.782.112: This page contains the following errors: error on line 657 at column 38: PCDATA invalid Char value 12 Below is a rendering of the page up to the first error. * Mozilla Firefox 3.6.19 & Mozilla Firefox 5.0: XML Parsing Error: not well-formed Location: http://path/to/git/repo/blah/blah Both errors were generated by gitweb.perl v1.7.3.4 w/ highlight 2.7 using arch/ia64/kernel/unwind.c from the Linux kernel. When syntax highlighter is not used, control characters are replaced by esc_html(), but with syntax highlighter they were passed through to browser (to_utf8() doesn't remove control characters). Introduce sanitize() subroutine which strips forbidden characters, but does not perform HTML escaping, and use it in git_blob() to sanitize syntax highlighter output for XHTML. Note that excluding "\t" (U+0009), "\n" (U+000A) and "\r" (U+000D) is not strictly necessary, atleast for currently the only callsite: "\t" tabs are replaced by spaces by untabify(), "\n" is stripped from each line before processing it, and replacing "\r" could be considered improvement. Originally-by: Christopher M. Fuhrman Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

Merge branch 'jn/mime-type-with-params' into maint

2011-08-16T18:41:26Z

* jn/mime-type-with-params: gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss

Merge branch 'jn/gitweb-config-list-case'

2011-08-08T19:33:35Z

* jn/gitweb-config-list-case: gitweb: Git config keys are case insensitive, make config search too

Merge branch 'jn/gitweb-system-config'

2011-08-08T19:33:34Z

* jn/gitweb-system-config: gitweb: Introduce common system-wide settings for convenience