user/sven/git.git/gitweb/gitweb.perl, branch v1.7.8.2

Merge branch 'lh/gitweb-site-html-head'

2011-10-26T23:16:31Z

* lh/gitweb-site-html-head: gitweb: provide a way to customize html headers

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

2011-10-26T23:16:30Z

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

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: provide a way to customize html headers

2011-10-21T17:18:37Z

This allows web sites to add some specific html headers to the pages generated by gitweb. The new variable $site_html_head_string can be set to an html snippet that will be inserted at the end of the section of each page generated by gitweb. Signed-off-by: LÃ©naÃ¯c Huard 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/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

gitweb: pass string after encoding in utf-8 to syntax highlighter

2011-08-04T19:13:38Z

Otherwise the highlight filter would work on a corrupt byte sequence. Signed-off-by: 张忠山 Acked-by: Jakub Narebski Signed-off-by: Junio C Hamano

gitweb: Git config keys are case insensitive, make config search too

2011-08-01T01:39:19Z

"git config -z -l" that gitweb uses in git_parse_project_config() to populate %config hash returns section and key names of config variables in lowercase (they are case insensitive). When checking %config in git_get_project_config() we have to take it into account. Helped-by: Junio C Hamano Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

gitweb: Introduce common system-wide settings for convenience

2011-07-24T23:22:21Z

Because of backward compatibility we cannot change gitweb to always use /etc/gitweb.conf (i.e. even if gitweb_config.perl exists). For common system-wide settings we therefore need separate configuration file: /etc/gitweb-common.conf. Long description: gitweb currently obtains configuration from the following sources: 1. per-instance configuration file (default: gitweb_conf.perl) 2. system-wide configuration file (default: /etc/gitweb.conf) If per-instance configuration file exists, then system-wide configuration is _not used at all_. This is quite untypical and suprising behavior. Moreover it is different from way git itself treats /etc/git.conf. It reads in stuff from /etc/git.conf and then local repos can change or override things as needed. In fact this is quite beneficial, because it gives site admins a simple and easy way to give an automatic hint to a repo about things the admin would like. On the other hand changing current behavior may lead to the situation, where something in /etc/gitweb.conf may interfere with unintended interaction in the local repository. One solution would be to _require_ to do explicit include; with read_config_file() it is now easy, as described in gitweb/README (description introduced in this commit). But as J.H. noticed we cannot ask people to modify their per-instance gitweb config file to include system-wide settings, nor we can require them to do this. Therefore, as proposed by Junio, for gitweb to have centralized config elements while retaining backwards compatibility, introduce separate common system-wide configuration file, by default /etc/gitweb-common.conf Noticed-by: Drew Northup Helped-by: John 'Warthog9' Hawley Inspired-by: Junio C Hamano Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano