{"thread":{"id":"22216","subject":"[PATCH 1/9] gitweb: Load checking","startedAt":"2010-01-14T01:22:56Z","lastAt":"2010-02-07T21:32:06Z","messageCount":60,"participants":["John 'Warthog9' Hawley","Jakub Narebski","J.H.","Junio C Hamano","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":9},"messages":[{"id":"131564","messageId":"1263432185-21334-1-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":null,"subject":"[PATCH 0/9] Gitweb caching v5","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:22:56Z","receivedAt":"2010-01-14T01:22:56Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"Afternoon everyone,\n \nThis is the latest incarnation of gitweb w/ caching. This is\nfinally at the point where it should probably start either being\nconsidered for inclusion or mainline, or I need to accept that this\nwill never get in and more perminantely fork (as is the case with\nFedora where this is going in as gitweb-caching as a parrallel rpm\npackage).\n\nThat said this brings the base up to mainline (again), it updates a\nnumber of elements in the caching engine, and this is a much cleaner\nbreak-out of the tree vs. what I am currently developing against.\n\nv5:\n\t- Missed a couple of things that were in my local tree, and\n\t added them back in.\n\t- Split up the die_error and the version matching patch\n\t- Set version matching to be on by default - otherwise this\n\t really is code that will never get checked, or at best\n\t enabled by default by distributions\n\t- Added a minor code cleanup with respect to $site_header\n\t that was already in my tree\n\t- Applied against a more recent git tree vs. 1.6.6-rc2\n\t- Removed breakout patch for now (did that in v4 actually)\n\t and will deal with that separately \n\n\thttp://git.kernel.org/?p=git/warthog9/gitweb.git;a=shortlog;h=refs/heads/gitweb-ml-v5\n\nv4:\n\t- major re-working of the caching layer to use file handle\n\t redirection instead of buffering output\n\t- other minor improvements\n\n\thttp://git.kernel.org/?p=git/warthog9/gitweb.git;a=shortlog;h=refs/heads/gitweb-ml-v4\nv3:\n\t- various minor re-works based on mailing list feedback,\n\t this series was not sent to the mailing list.\nv2:\n\t- Better breakout\n\t- You can actually disable the cache now\n\n- John 'Warthog9' Hawley \n\n\n\nJohn 'Warthog9' Hawley (9):\n gitweb: Load checking\n gitweb: change die_error to take \"extra\" argument for extended die\n information\n gitweb: Add option to force version match\n gitweb: Makefile improvements\n gitweb: add a get function to compliment print_local_time\n gitweb: add a get function to compliment print_sort_th\n gitweb: cleanup error message produced by undefined $site_header\n gitweb: Convert output to using indirect file handle\n gitweb: File based caching layer (from git.kernel.org)\n\n Makefile | 65 +---\n gitweb/Makefile | 129 +++++++\n gitweb/README | 10 +-\n gitweb/cache.pm | 283 ++++++++++++++\n gitweb/gitweb.css | 6 +\n gitweb/gitweb.perl | 1034 ++++++++++++++++++++++++++++++----------------------\n 6 files changed, 1030 insertions(+), 497 deletions(-)\n create mode 100644 gitweb/Makefile\n create mode 100644 gitweb/cache.pm\n"},{"id":"131559","messageId":"1263432185-21334-2-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-1-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 1/9] gitweb: Load checking","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:22:57Z","receivedAt":"2010-01-14T01:22:57Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"From: John 'Warthog9' Hawley \n\nThis changes slightly the behavior of gitweb, so that it verifies\nthat the box isn't inundated with before attempting to serve gitweb.\nIf the box is overloaded, it basically returns a 503 Server Unavailable\nuntil the load falls below the defined threshold. This helps dramatically\nif you have a box that's I/O bound, reaches a certain load and you\ndon't want gitweb, the I/O hog that it is, increasing the pain the\nserver is already undergoing.\n\nThis behavior is controlled by $maxload configuration variable.\nDefault is a load of 300, which for most cases should never be hit.\nUnset it (set it to undefined value, i.e. undef) to turn off checking.\n\nCurrently it requires that '/proc/loadavg' file exists, otherwise the\nload check is bypassed (load is taken to be 0). So platforms that do\nnot implement '/proc/loadavg' currently cannot use this feature.\n(provisions are included for additional checks to be added by others)\n\nSigned-off-by: John 'Warthog9' Hawley \nSigned-off-by: Jakub Narebski \n---\n gitweb/README | 7 ++++++-\n gitweb/gitweb.perl | 45 +++++++++++++++++++++++++++++++++++++++++----\n 2 files changed, 47 insertions(+), 5 deletions(-)\n\ndiff --git a/gitweb/README b/gitweb/README\nindex e34ee79..6c2c8e1 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -174,7 +174,7 @@ not include variables usually directly set during build):\n Base URL for relative URLs in pages generated by gitweb,\n (e.g. $logo, $favicon, @stylesheets if they are relative URLs),\n needed and used only for URLs with nonempty PATH_INFO via\n- . Usually gitweb sets its value correctly,\n+ . Usually gitweb sets its value correctly,\n and there is no need to set this variable, e.g. to $my_uri or \"/\".\n * $home_link\n Target of the home link on top of all pages (the first part of view\n@@ -228,6 +228,11 @@ not include variables usually directly set during build):\n repositories from launching cross-site scripting (XSS) attacks. Set this\n to true if you don't trust the content of your repositories. The default\n is false.\n+ * $maxload\n+ Used to set the maximum load that we will still respond to gitweb queries.\n+ If server load exceed this value then return \"503 Service Unavaliable\" error.\n+ Server load is taken to be 0 if gitweb cannot determine its value. Set it to\n+ undefined value to turn it off. The default is 300.\n \n \n Projects list file format\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 7e477af..0a07d3a 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -221,6 +221,12 @@ our %avatar_size = (\n \t'double' => 32\n );\n \n+# Used to set the maximum load that we will still respond to gitweb queries.\n+# If server load exceed this value then return \"503 server busy\" error.\n+# If gitweb cannot determined server load, it is taken to be 0.\n+# Leave it undefined (or set to 'undef') to turn off load checking.\n+our $maxload = 300;\n+\n # You define site-wide feature defaults here; override them with\n # $GITWEB_CONFIG as necessary.\n our %feature = (\n@@ -551,6 +557,32 @@ if (-e $GITWEB_CONFIG) {\n \tdo $GITWEB_CONFIG_SYSTEM if -e $GITWEB_CONFIG_SYSTEM;\n }\n \n+# Get loadavg of system, to compare against $maxload.\n+# Currently it requires '/proc/loadavg' present to get loadavg;\n+# if it is not present it returns 0, which means no load checking.\n+sub get_loadavg {\n+\tif( -e '/proc/loadavg' ){\n+\t\topen my $fd, '<', '/proc/loadavg'\n+\t\t\tor return 0;\n+\t\tmy @load = split(/\\s+/, scalar <$fd>);\n+\t\tclose $fd;\n+\n+\t\t# The first three columns measure CPU and IO utilization of the last one,\n+\t\t# five, and 10 minute periods. The fourth column shows the number of\n+\t\t# currently running processes and the total number of processes in the m/n\n+\t\t# format. The last column displays the last process ID used.\n+\t\treturn $load[0] || 0;\n+\t}\n+\t# additional checks for load average should go here for things that don't export\n+\t# /proc/loadavg\n+\n+\treturn 0;\n+}\n+\n+if (defined $maxload && get_loadavg() > $maxload) {\n+\tdie_error(503, \"The load average on the server is too high\");\n+}\n+\n # version of the core git binary\n our $git_version = qx(\"$GIT\" --version) =~ m/git version (.*)$/ ? $1 : \"unknown\";\n $number_of_git_cmds++;\n@@ -3354,14 +3386,19 @@ sub git_footer_html {\n # 500: The server isn't configured properly, or\n # an internal error occurred (e.g. failed assertions caused by bugs), or\n # an unknown error occurred (e.g. the git binary died unexpectedly).\n+# 503: The server is currently unavailable (because it is overloaded,\n+# or down for maintenance). Generally, this is a temporary state.\n sub die_error {\n \tmy $status = shift || 500;\n \tmy $error = shift || \"Internal server error\";\n \n-\tmy %http_responses = (400 => '400 Bad Request',\n-\t\t\t 403 => '403 Forbidden',\n-\t\t\t 404 => '404 Not Found',\n-\t\t\t 500 => '500 Internal Server Error');\n+\tmy %http_responses = (\n+\t\t400 => '400 Bad Request',\n+\t\t403 => '403 Forbidden',\n+\t\t404 => '404 Not Found',\n+\t\t500 => '500 Internal Server Error',\n+\t\t503 => '503 Service Unavailable',\n+\t);\n \tgit_header_html($http_responses{$status});\n \tprint <\n-- \n1.6.5.2\n"},{"id":"131562","messageId":"1263432185-21334-3-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-2-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 2/9] gitweb: change die_error to take \"extra\" argument for extended die information","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:22:58Z","receivedAt":"2010-01-14T01:22:58Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"This is a small change that just adds a 3rd, optional, parameter to die_error\nthat allows for extended error information to be output along with what the\nerror was.\n---\n gitweb/gitweb.perl | 8 +++++++-\n 1 files changed, 7 insertions(+), 1 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 0a07d3a..8298de5 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -3391,6 +3391,7 @@ sub git_footer_html {\n sub die_error {\n \tmy $status = shift || 500;\n \tmy $error = shift || \"Internal server error\";\n+\tmy $extra = shift;\n \n \tmy %http_responses = (\n \t\t400 => '400 Bad Request',\n@@ -3405,8 +3406,13 @@ sub die_error {\n

\n $status - $error\n
\n-\n EOF\n+\tif (defined $extra) {\n+\t\tprint \"
\\n\" .\n+\t\t\t\"$extra\\n\";\n+\t}\n+\tprint \"\\n\";\n+\n \tgit_footer_html();\n \texit;\n }\n-- \n1.6.5.2\n"},{"id":"131561","messageId":"1263432185-21334-4-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-3-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 3/9] gitweb: Add option to force version match","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:22:59Z","receivedAt":"2010-01-14T01:22:59Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"This adds $git_versions_must_match variable, which is set to true,\nchecks that we are running on the same version of git that we\nshipped with, and if not throw '500 Internal Server Error' error.\nWhat is checked is the version of gitweb (embedded in building\ngitweb.cgi), against version of runtime git binary used.\n\nGitweb can usually run with a mismatched git install. This is more\nhere to give an obvious warning as to whats going on vs. silently\nfailing.\n\nBy default this feature is turned on.\n\nSigned-off-by: John 'Warthog9' Hawley \nSigned-off-by: Jakub Narebski \n---\n gitweb/README | 3 +++\n gitweb/gitweb.perl | 23 +++++++++++++++++++++++\n 2 files changed, 26 insertions(+), 0 deletions(-)\n\ndiff --git a/gitweb/README b/gitweb/README\nindex 6c2c8e1..03151d2 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -233,6 +233,9 @@ not include variables usually directly set during build):\n If server load exceed this value then return \"503 Service Unavaliable\" error.\n Server load is taken to be 0 if gitweb cannot determine its value. Set it to\n undefined value to turn it off. The default is 300.\n+ * $git_versions_must_match\n+ If set, gitweb fails with 500 Internal Server Error if the version of gitweb\n+ doesn't match version of git binary. The default is true.\n \n \n Projects list file format\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 8298de5..b41bc33 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -221,6 +221,9 @@ our %avatar_size = (\n \t'double' => 32\n );\n \n+# If it is true, exit if gitweb version and git binary version don't match\n+our $git_versions_must_match = 1;\n+\n # Used to set the maximum load that we will still respond to gitweb queries.\n # If server load exceed this value then return \"503 server busy\" error.\n # If gitweb cannot determined server load, it is taken to be 0.\n@@ -587,6 +590,26 @@ if (defined $maxload && get_loadavg() > $maxload) {\n our $git_version = qx(\"$GIT\" --version) =~ m/git version (.*)$/ ? $1 : \"unknown\";\n $number_of_git_cmds++;\n \n+# Throw an error if git versions does not match, if $git_versions_must_match is true.\n+if ($git_versions_must_match &&\n+ $git_version ne $version) {\n+\tmy $admin_contact =\n+\t\tdefined $ENV{'SERVER_ADMIN'} ? \", $ENV{'SERVER_ADMIN'},\" : '';\n+\tmy $err_msg = <*** Warning ***\n+

\n+This version of gitweb was compiled for @{[esc_html($version)]},\n+however git version @{[esc_html($git_version)]} was found on server,\n+and administrator requested strict version checking.\n+

\n+

\n+Please contact the server administrator${admin_contact} to either configure\n+gitweb to allow mismatched versions, or update git or gitweb installation.\n+

\n+EOT\n+\tdie_error(500, 'Internal server error', $err_msg);\n+}\n+\n $projects_list ||= $projectroot;\n \n # ======================================================================\n-- \n1.6.5.2\n"},{"id":"131565","messageId":"1263432185-21334-5-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-4-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 4/9] gitweb: Makefile improvements","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:23:00Z","receivedAt":"2010-01-14T01:23:00Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"From: John 'Warthog9' Hawley \n\nThis commit adjust the main Makefile so you can simply run\n\n make gitweb\n\nwhich in turn calls gitweb/Makefile. This means that in order to\ngenerate gitweb, you can simply run 'make' from gitweb subdirectory:\n\n cd gitweb\n make\n\nTargets gitweb/gitweb.cgi and (dependent on JSMIN being defined)\ngitweb/gitweb.min.js in main Makefile are preserved for backward\ncompatibility.\n\nSigned-off-by: John 'Warthog9' Hawley \nSigned-off-by: Jakub Narebski \n---\n Makefile | 65 +++++----------------------\n gitweb/Makefile | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 141 insertions(+), 53 deletions(-)\n create mode 100644 gitweb/Makefile\n\ndiff --git a/Makefile b/Makefile\nindex be18389..9f069a8 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -282,29 +282,6 @@ pathsep = :\n # JavaScript minifier invocation that can function as filter\n JSMIN =\n \n-# default configuration for gitweb\n-GITWEB_CONFIG = gitweb_config.perl\n-GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf\n-GITWEB_HOME_LINK_STR = projects\n-GITWEB_SITENAME =\n-GITWEB_PROJECTROOT = /pub/git\n-GITWEB_PROJECT_MAXDEPTH = 2007\n-GITWEB_EXPORT_OK =\n-GITWEB_STRICT_EXPORT =\n-GITWEB_BASE_URL =\n-GITWEB_LIST =\n-GITWEB_HOMETEXT = indextext.html\n-GITWEB_CSS = gitweb.css\n-GITWEB_LOGO = git-logo.png\n-GITWEB_FAVICON = git-favicon.png\n-ifdef JSMIN\n-GITWEB_JS = gitweb.min.js\n-else\n-GITWEB_JS = gitweb.js\n-endif\n-GITWEB_SITE_HEADER =\n-GITWEB_SITE_FOOTER =\n-\n export prefix bindir sharedir sysconfdir\n \n CC = gcc\n@@ -1535,6 +1512,11 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl\n \tchmod +x $@+ && \\\n \tmv $@+ $@\n \n+\n+.PHONY: gitweb\n+gitweb:\n+\t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all\n+\n ifdef JSMIN\n OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js\n gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js\n@@ -1542,30 +1524,13 @@ else\n OTHER_PROGRAMS += gitweb/gitweb.cgi\n gitweb/gitweb.cgi: gitweb/gitweb.perl\n endif\n-\t$(QUIET_GEN)$(RM) $@ $@+ && \\\n-\tsed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \\\n-\t -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \\\n-\t -e 's|++GIT_BINDIR++|$(bindir)|g' \\\n-\t -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \\\n-\t -e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \\\n-\t -e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \\\n-\t -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \\\n-\t -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \\\n-\t -e 's|\"++GITWEB_PROJECT_MAXDEPTH++\"|$(GITWEB_PROJECT_MAXDEPTH)|g' \\\n-\t -e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \\\n-\t -e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \\\n-\t -e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \\\n-\t -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \\\n-\t -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \\\n-\t -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \\\n-\t -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \\\n-\t -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \\\n-\t -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \\\n-\t -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \\\n-\t -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \\\n-\t $< >$@+ && \\\n-\tchmod +x $@+ && \\\n-\tmv $@+ $@\n+\t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n+\n+ifdef JSMIN\n+gitweb/gitweb.min.js: gitweb/gitweb.js\n+\t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n+endif # JSMIN\n+\n \n git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n@@ -1592,12 +1557,6 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh\n \tmv $@+ $@\n endif # NO_PERL\n \n-\n-ifdef JSMIN\n-gitweb/gitweb.min.js: gitweb/gitweb.js\n-\t$(QUIET_GEN)$(JSMIN) <$< >$@\n-endif # JSMIN\n-\n ifndef NO_PYTHON\n $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS\n $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py\ndiff --git a/gitweb/Makefile b/gitweb/Makefile\nnew file mode 100644\nindex 0000000..c9eb1ee\n--- /dev/null\n+++ b/gitweb/Makefile\n@@ -0,0 +1,129 @@\n+# The default target of this Makefile is...\n+all::\n+\n+# Define V=1 to have a more verbose compile.\n+#\n+# Define JSMIN to point to JavaScript minifier that functions as\n+# a filter to have gitweb.js minified.\n+#\n+\n+prefix ?= $(HOME)\n+bindir ?= $(prefix)/bin\n+RM ?= rm -f\n+\n+# JavaScript minifier invocation that can function as filter\n+JSMIN ?=\n+\n+# default configuration for gitweb\n+GITWEB_CONFIG = gitweb_config.perl\n+GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf\n+GITWEB_HOME_LINK_STR = projects\n+GITWEB_SITENAME =\n+GITWEB_PROJECTROOT = /pub/git\n+GITWEB_PROJECT_MAXDEPTH = 2007\n+GITWEB_EXPORT_OK =\n+GITWEB_STRICT_EXPORT =\n+GITWEB_BASE_URL =\n+GITWEB_LIST =\n+GITWEB_HOMETEXT = indextext.html\n+GITWEB_CSS = gitweb.css\n+GITWEB_LOGO = git-logo.png\n+GITWEB_FAVICON = git-favicon.png\n+ifdef JSMIN\n+GITWEB_JS = gitweb.min.js\n+else\n+GITWEB_JS = gitweb.js\n+endif\n+GITWEB_SITE_HEADER =\n+GITWEB_SITE_FOOTER =\n+\n+# include user config\n+-include ../config.mak.autogen\n+-include ../config.mak\n+\n+# determine version\n+../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE\n+\t$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE\n+\n+-include ../GIT-VERSION-FILE\n+\n+### Build rules\n+\n+SHELL_PATH ?= $(SHELL)\n+PERL_PATH ?= /usr/bin/perl\n+\n+# Shell quote;\n+bindir_SQ = $(subst ','\\'',$(bindir)) #'\n+SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH)) #'\n+PERL_PATH_SQ = $(subst ','\\'',$(PERL_PATH)) #'\n+\n+# Quiet generation (unless V=1)\n+QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir\n+QUIET_SUBDIR1 =\n+\n+ifneq ($(findstring $(MAKEFLAGS),w),w)\n+PRINT_DIR = --no-print-directory\n+else # \"make -w\"\n+NO_SUBDIR = :\n+endif\n+\n+ifneq ($(findstring $(MAKEFLAGS),s),s)\n+ifndef V\n+\tQUIET = @\n+\tQUIET_GEN = $(QUIET)echo ' ' GEN $@;\n+\tQUIET_SUBDIR0 = +@subdir=\n+\tQUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \\\n+\t $(MAKE) $(PRINT_DIR) -C $$subdir\n+\texport V\n+\texport QUIET\n+\texport QUIET_GEN\n+\texport QUIET_SUBDIR0\n+\texport QUIET_SUBDIR1\n+endif\n+endif\n+\n+all:: gitweb.cgi\n+\n+ifdef JSMIN\n+FILES=gitweb.cgi gitweb.min.js\n+gitweb.cgi: gitweb.perl gitweb.min.js\n+else # !JSMIN\n+FILES=gitweb.cgi\n+gitweb.cgi: gitweb.perl\n+endif # JSMIN\n+\n+gitweb.cgi:\n+\t$(QUIET_GEN)$(RM) $@ $@+ && \\\n+\tsed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \\\n+\t -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \\\n+\t -e 's|++GIT_BINDIR++|$(bindir)|g' \\\n+\t -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \\\n+\t -e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \\\n+\t -e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \\\n+\t -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \\\n+\t -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \\\n+\t -e 's|\"++GITWEB_PROJECT_MAXDEPTH++\"|$(GITWEB_PROJECT_MAXDEPTH)|g' \\\n+\t -e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \\\n+\t -e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \\\n+\t -e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \\\n+\t -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \\\n+\t -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \\\n+\t -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \\\n+\t -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \\\n+\t -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \\\n+\t -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \\\n+\t -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \\\n+\t -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \\\n+\t $< >$@+ && \\\n+\tchmod +x $@+ && \\\n+\tmv $@+ $@\n+\n+ifdef JSMIN\n+gitweb.min.js: gitweb.js\n+\t$(QUIET_GEN)$(JSMIN) <$< >$@\n+endif # JSMIN\n+\n+clean:\n+\t$(RM) $(FILES)\n+\n+.PHONY: all clean .FORCE-GIT-VERSION-FILE\n-- \n1.6.5.2\n"},{"id":"131567","messageId":"1263432185-21334-6-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-5-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 5/9] gitweb: add a get function to compliment print_local_time","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:23:01Z","receivedAt":"2010-01-14T01:23:01Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"This adds a get function for print_local_time so that the basic\nfunction can be used outside of their straight printing operation.\n---\n gitweb/gitweb.perl | 11 +++++++++--\n 1 files changed, 9 insertions(+), 2 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex b41bc33..d38aad6 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -3537,14 +3537,21 @@ sub git_print_header_div {\n }\n \n sub print_local_time {\n+\tprint get_local_time(@_);\n+}\n+\n+sub get_local_time {\n+\tmy $localtime = \"\";\n \tmy %date = @_;\n \tif ($date{'hour_local'} < 6) {\n-\t\tprintf(\" (%02d:%02d %s)\",\n+\t\t$localtime .= sprintf(\" (%02d:%02d %s)\",\n \t\t\t$date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});\n \t} else {\n-\t\tprintf(\" (%02d:%02d %s)\",\n+\t\t$localtime .= sprintf(\" (%02d:%02d %s)\",\n \t\t\t$date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});\n \t}\n+\n+\treturn $localtime\n }\n \n # Outputs the author name and date in long form\n-- \n1.6.5.2\n"},{"id":"131560","messageId":"1263432185-21334-7-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-6-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 6/9] gitweb: add a get function to compliment print_sort_th","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:23:02Z","receivedAt":"2010-01-14T01:23:02Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"This adds a get function for print_sort_th so that the basic\nfunction can be used outside of their straight printing operation.\n---\n gitweb/gitweb.perl | 11 +++++++++--\n 1 files changed, 9 insertions(+), 2 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex d38aad6..07fdeb5 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -4375,17 +4375,24 @@ sub fill_project_list_info {\n # print 'sort by' element, generating 'sort by $name' replay link\n # if that order is not selected\n sub print_sort_th {\n+\tprint get_sort_th(@_);\n+}\n+\n+sub get_sort_th {\n \tmy ($name, $order, $header) = @_;\n+\tmy $sortth = \"\";\n \t$header ||= ucfirst($name);\n \n \tif ($order eq $name) {\n-\t\tprint \"$header\\n\";\n+\t\t$sortth .= \"$header\\n\";\n \t} else {\n-\t\tprint \"\" .\n+\t\t$sortth .= \"\" .\n \t\t $cgi->a({-href => href(-replay=>1, order=>$name),\n \t\t -class => \"header\"}, $header) .\n \t\t \"\\n\";\n \t}\n+\n+\treturn $sortth;\n }\n \n sub git_project_list_body {\n-- \n1.6.5.2\n"},{"id":"131563","messageId":"1263432185-21334-8-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-7-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 7/9] gitweb: cleanup error message produced by undefined $site_header","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:23:03Z","receivedAt":"2010-01-14T01:23:03Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"If $site_header is not defined you get extraneous errors in the web\nlogs:\n\n[Wed Jan 13 16:55:42 2010] [error] [client ::1] [Wed Jan 13 16:55:42 2010] gitweb.cgi: Use of uninitialized value $site_header in -f at /var/www/gitweb/gitweb.cgi line 3287., referer: http://git/gitweb.cgi\n\nfor example. This ensures that the variable is defined before trying to use it.\n---\n gitweb/gitweb.perl | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 07fdeb5..c4a177d 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -3277,7 +3277,7 @@ EOF\n \tprint \"\\n\" .\n \t \"\\n\";\n \n-\tif (-f $site_header) {\n+\tif ($site_header && -f $site_header) {\n \t\tinsert_file($site_header);\n \t}\n \n-- \n1.6.5.2\n"},{"id":"131566","messageId":"1263432185-21334-9-git-send-email-warthog9@eaglescrag.net","threadId":"22216","inReplyTo":"1263432185-21334-8-git-send-email-warthog9@eaglescrag.net","subject":"[PATCH 8/9] gitweb: Convert output to using indirect file handle","fromName":"John 'Warthog9' Hawley","fromEmail":"warthog9@eaglescrag.net","sentAt":"2010-01-14T01:23:04Z","receivedAt":"2010-01-14T01:23:04Z","isPatch":true,"sender":{"key":"warthog9@kernel.org","avatar":"https://avatars.githubusercontent.com/u/2334704?v=4"},"body":"This converts the output handling of gitweb to using an indirect\nfile handle. This is in preparation to add the caching layer. This\nis a slight modification to the way I was originally doing it by\npassing the output around. This should be a nop and this shouldn't\nchange the behavior of gitweb. This does leave error reporting\nfunctions (die_error specifically) continuing to output directly\nas I want to garauntee those will report their errors regardless of\nwhat may be going on with respect to the rest of the output.\n---\n gitweb/gitweb.perl | 880 ++++++++++++++++++++++++++--------------------------\n 1 files changed, 448 insertions(+), 432 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex c4a177d..8bb323c 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -450,6 +450,13 @@ our %feature = (\n \t\t'default' => [0]},\n );\n \n+# Basic file handler for all of gitweb, there are two of them. The first\n+# is the basic text/html file handler which is used for everything other\n+# then the binary files, that uses a separate file handler though\n+# these are both set to STDOUT for the time being.\n+our $output_handler = *STDOUT;\n+our $output_handler_bin = *STDOUT;\n+\n sub gitweb_get_feature {\n \tmy ($name) = @_;\n \treturn unless exists $feature{$name};\n@@ -3081,7 +3088,7 @@ sub insert_file {\n \tmy $filename = shift;\n \n \topen my $fd, '<', $filename;\n-\tprint map { to_utf8($_) } <$fd>;\n+\tprint {$output_handler} map { to_utf8($_) } <$fd>;\n \tclose $fd;\n }\n \n@@ -3198,10 +3205,10 @@ sub git_header_html {\n \t} else {\n \t\t$content_type = 'text/html';\n \t}\n-\tprint $cgi->header(-type=>$content_type, -charset => 'utf-8',\n+\tprint {$output_handler} $cgi->header(-type=>$content_type, -charset => 'utf-8',\n \t -status=> $status, -expires => $expires);\n \tmy $mod_perl_version = $ENV{'MOD_PERL'} ? \" $ENV{'MOD_PERL'}\" : '';\n-\tprint <\n \n \n@@ -3216,16 +3223,16 @@ EOF\n \t# the stylesheet, favicon etc urls won't work correctly with path_info\n \t# unless we set the appropriate base URL\n \tif ($ENV{'PATH_INFO'}) {\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t}\n \t# print out each stylesheet that exist, providing backwards capability\n \t# for those people who defined $stylesheet in a config file\n \tif (defined $stylesheet) {\n-\t\tprint ''.\"\\n\";\n+\t\tprint {$output_handler} ''.\"\\n\";\n \t} else {\n \t\tforeach my $stylesheet (@stylesheets) {\n \t\t\tnext unless $stylesheet;\n-\t\t\tprint ''.\"\\n\";\n+\t\t\tprint {$output_handler} ''.\"\\n\";\n \t\t}\n \t}\n \tif (defined $project) {\n@@ -3244,7 +3251,7 @@ EOF\n \n \t\t\t$href_params{'action'} = $type;\n \t\t\t$link_attr{'-href'} = href(%href_params);\n-\t\t\tprint \"'.\"\\n\",\n \t\t $site_name, href(project=>undef, action=>\"project_index\"));\n-\t\tprintf(''.\"\\n\",\n \t\t $site_name, href(project=>undef, action=>\"opml\"));\n \t}\n \tif (defined $favicon) {\n-\t\tprint qq(\\n);\n+\t\tprint {$output_handler} qq(\\n);\n \t}\n \n-\tprint \"\\n\" .\n+\tprint {$output_handler} \"\\n\" .\n \t \"\\n\";\n \n \tif ($site_header && -f $site_header) {\n \t\tinsert_file($site_header);\n \t}\n \n-\tprint \"
\\n\" .\n+\tprint {$output_handler} \"
\\n\" .\n \t $cgi->a({-href => esc_url($logo_url),\n \t -title => $logo_label},\n \t qq(\"git\"));\n-\tprint $cgi->a({-href => esc_url($home_link)}, $home_link_str) . \" / \";\n+\tprint {$output_handler} $cgi->a({-href => esc_url($home_link)}, $home_link_str) . \" / \";\n \tif (defined $project) {\n-\t\tprint $cgi->a({-href => href(action=>\"summary\")}, esc_html($project));\n+\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"summary\")}, esc_html($project));\n \t\tif (defined $action) {\n-\t\t\tprint \" / $action\";\n+\t\t\tprint {$output_handler} \" / $action\";\n \t\t}\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t}\n-\tprint \"
\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \n \tmy $have_search = gitweb_check_feature('search');\n \tif (defined $project && $have_search) {\n@@ -3313,7 +3320,7 @@ EOF\n \t\tif ($use_pathinfo) {\n \t\t\t$action .= \"/\".esc_url($project);\n \t\t}\n-\t\tprint $cgi->startform(-method => \"get\", -action => $action) .\n+\t\tprint {$output_handler} $cgi->startform(-method => \"get\", -action => $action) .\n \t\t \"
\\n\" .\n \t\t (!$use_pathinfo &&\n \t\t $cgi->input({-name=>\"p\", -value=>$project, -type=>\"hidden\"}) . \"\\n\") .\n@@ -3336,11 +3343,11 @@ EOF\n sub git_footer_html {\n \tmy $feed_class = 'rss_logo';\n \n-\tprint \"
\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tif (defined $project) {\n \t\tmy $descr = git_get_project_description($project);\n \t\tif (defined $descr) {\n-\t\t\tprint \"
\" . esc_html($descr) . \"
\\n\";\n+\t\t\tprint {$output_handler} \"
\" . esc_html($descr) . \"
\\n\";\n \t\t}\n \n \t\tmy %href_params = get_feed_info();\n@@ -3351,22 +3358,22 @@ sub git_footer_html {\n \n \t\tforeach my $format qw(RSS Atom) {\n \t\t\t$href_params{'action'} = lc($format);\n-\t\t\tprint $cgi->a({-href => href(%href_params),\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(%href_params),\n \t\t\t -title => \"$href_params{'-title'} $format feed\",\n \t\t\t -class => $feed_class}, $format).\"\\n\";\n \t\t}\n \n \t} else {\n-\t\tprint $cgi->a({-href => href(project=>undef, action=>\"opml\"),\n+\t\tprint {$output_handler} $cgi->a({-href => href(project=>undef, action=>\"opml\"),\n \t\t -class => $feed_class}, \"OPML\") . \" \";\n-\t\tprint $cgi->a({-href => href(project=>undef, action=>\"project_index\"),\n+\t\tprint {$output_handler} $cgi->a({-href => href(project=>undef, action=>\"project_index\"),\n \t\t -class => $feed_class}, \"TXT\") . \"\\n\";\n \t}\n-\tprint \"
\\n\"; # class=\"page_footer\"\n+\tprint {$output_handler} \"
\\n\"; # class=\"page_footer\"\n \n \tif (defined $t0 && gitweb_check_feature('timed')) {\n-\t\tprint \"
\\n\";\n-\t\tprint 'This page took '.\n+\t\tprint {$output_handler} \"
\\n\";\n+\t\tprint {$output_handler} 'This page took '.\n \t\t ''.\n \t\t Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).\n \t\t ' seconds '.\n@@ -3375,26 +3382,26 @@ sub git_footer_html {\n \t\t $number_of_git_cmds.\n \t\t ' git commands '.\n \t\t \" to generate.\\n\";\n-\t\tprint \"
\\n\"; # class=\"page_footer\"\n+\t\tprint {$output_handler} \"
\\n\"; # class=\"page_footer\"\n \t}\n \n \tif (-f $site_footer) {\n \t\tinsert_file($site_footer);\n \t}\n \n-\tprint qq!\\n!;\n+\tprint {$output_handler} qq!\\n!;\n \tif ($action eq 'blame_incremental') {\n-\t\tprint qq!\\n!;\n \t} elsif (gitweb_check_feature('javascript-actions')) {\n-\t\tprint qq!\\n!;\n \t}\n \n-\tprint \"\\n\" .\n+\tprint {$output_handler} \"\\n\" .\n \t \"\";\n }\n \n@@ -3416,6 +3423,14 @@ sub die_error {\n \tmy $error = shift || \"Internal server error\";\n \tmy $extra = shift;\n \n+\t# The output handlers for die_error need to be reset to STDOUT\n+\t# so that half the message isn't being output to random and \n+\t# half to STDOUT as expected. This is mainly for the benefit\n+\t# of using git_header_html() and git_footer_html() since those\n+\t# internaly use the indirect print handler.\n+\t$output_handler = *STDOUT;\n+\t$output_handler_bin = *STDOUT;\n+\n \tmy %http_responses = (\n \t\t400 => '400 Bad Request',\n \t\t403 => '403 Forbidden',\n@@ -3484,12 +3499,12 @@ sub git_print_page_nav {\n \t\t$arg{$label}{'_href'} = $link;\n \t}\n \n-\tprint \"
\\n\" .\n+\tprint {$output_handler} \"
\\n\" .\n \t\t(join \" | \",\n \t\t map { $_ eq $current ?\n \t\t $_ : $cgi->a({-href => ($arg{$_}{_href} ? $arg{$_}{_href} : href(%{$arg{$_}}))}, \"$_\")\n \t\t } @navs);\n-\tprint \"
\\n$extra
\\n\" .\n+\tprint {$output_handler} \"
\\n$extra
\\n\" .\n \t \"
\\n\";\n }\n \n@@ -3530,14 +3545,14 @@ sub git_print_header_div {\n \t$args{'hash'} = $hash if $hash;\n \t$args{'hash_base'} = $hash_base if $hash_base;\n \n-\tprint \"
\\n\" .\n+\tprint {$output_handler} \"
\\n\" .\n \t $cgi->a({-href => href(%args), -class => \"title\"},\n \t $title ? $title : $action) .\n \t \"\\n
\\n\";\n }\n \n sub print_local_time {\n-\tprint get_local_time(@_);\n+\tprint {$output_handler} get_local_time(@_);\n }\n \n sub get_local_time {\n@@ -3562,11 +3577,11 @@ sub git_print_authorship {\n \tmy $author = $co->{'author_name'};\n \n \tmy %ad = parse_date($co->{'author_epoch'}, $co->{'author_tz'});\n-\tprint \"<$tag class=\\\"author_date\\\">\" .\n+\tprint {$output_handler} \"<$tag class=\\\"author_date\\\">\" .\n \t format_search_author($author, \"author\", esc_html($author)) .\n \t \" [$ad{'rfc2822'}\";\n-\tprint_local_time(%ad) if ($opts{-localtime});\n-\tprint \"]\" . git_get_avatar($co->{'author_email'}, -pad_before => 1)\n+\tprint {$output_handler} get_local_time(%ad) if ($opts{-localtime});\n+\tprint {$output_handler} \"]\" . git_get_avatar($co->{'author_email'}, -pad_before => 1)\n \t\t . \"\\n\";\n }\n \n@@ -3582,7 +3597,7 @@ sub git_print_authorship_rows {\n \t@people = ('author', 'committer') unless @people;\n \tforeach my $who (@people) {\n \t\tmy %wd = parse_date($co->{\"${who}_epoch\"}, $co->{\"${who}_tz\"});\n-\t\tprint \"$who\" .\n+\t\tprint {$output_handler} \"$who\" .\n \t\t format_search_author($co->{\"${who}_name\"}, $who,\n \t\t\t esc_html($co->{\"${who}_name\"})) . \" \" .\n \t\t format_search_author($co->{\"${who}_email\"}, $who,\n@@ -3592,8 +3607,8 @@ sub git_print_authorship_rows {\n \t\t \"\\n\" .\n \t\t \"\" .\n \t\t \" $wd{'rfc2822'}\";\n-\t\tprint_local_time(%wd);\n-\t\tprint \"\" .\n+\t\tprint {$output_handler} get_local_time(%wd);\n+\t\tprint {$output_handler} \"\" .\n \t\t \"\\n\";\n \t}\n }\n@@ -3603,11 +3618,10 @@ sub git_print_page_path {\n \tmy $type = shift;\n \tmy $hb = shift;\n \n-\n-\tprint \"
\";\n-\tprint $cgi->a({-href => href(action=>\"tree\", hash_base=>$hb),\n+\tprint {$output_handler} \"
\";\n+\tprint {$output_handler} $cgi->a({-href => href(action=>\"tree\", hash_base=>$hb),\n \t -title => 'tree root'}, to_utf8(\"[$project]\"));\n-\tprint \" / \";\n+\tprint {$output_handler} \" / \";\n \tif (defined $name) {\n \t\tmy @dirname = split '/', $name;\n \t\tmy $basename = pop @dirname;\n@@ -3615,25 +3629,25 @@ sub git_print_page_path {\n \n \t\tforeach my $dir (@dirname) {\n \t\t\t$fullname .= ($fullname ? '/' : '') . $dir;\n-\t\t\tprint $cgi->a({-href => href(action=>\"tree\", file_name=>$fullname,\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"tree\", file_name=>$fullname,\n \t\t\t hash_base=>$hb),\n \t\t\t -title => $fullname}, esc_path($dir));\n-\t\t\tprint \" / \";\n+\t\t\tprint {$output_handler} \" / \";\n \t\t}\n \t\tif (defined $type && $type eq 'blob') {\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob_plain\", file_name=>$file_name,\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob_plain\", file_name=>$file_name,\n \t\t\t hash_base=>$hb),\n \t\t\t -title => $name}, esc_path($basename));\n \t\t} elsif (defined $type && $type eq 'tree') {\n-\t\t\tprint $cgi->a({-href => href(action=>\"tree\", file_name=>$file_name,\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"tree\", file_name=>$file_name,\n \t\t\t hash_base=>$hb),\n \t\t\t -title => $name}, esc_path($basename));\n-\t\t\tprint \" / \";\n+\t\t\tprint {$output_handler} \" / \";\n \t\t} else {\n-\t\t\tprint esc_path($basename);\n+\t\t\tprint {$output_handler} esc_path($basename);\n \t\t}\n \t}\n-\tprint \"
\\n\";\n+\tprint {$output_handler} \"
\\n\";\n }\n \n sub git_print_log {\n@@ -3657,7 +3671,7 @@ sub git_print_log {\n \t\t\t$signoff = 1;\n \t\t\t$empty = 0;\n \t\t\tif (! $opts{'-remove_signoff'}) {\n-\t\t\t\tprint \"\" . esc_html($line) . \"
\\n\";\n+\t\t\t\tprint {$output_handler} \"\" . esc_html($line) . \"
\\n\";\n \t\t\t\tnext;\n \t\t\t} else {\n \t\t\t\t# remove signoff lines\n@@ -3676,12 +3690,12 @@ sub git_print_log {\n \t\t\t$empty = 0;\n \t\t}\n \n-\t\tprint format_log_line_html($line) . \"
\\n\";\n+\t\tprint {$output_handler} format_log_line_html($line) . \"
\\n\";\n \t}\n \n \tif ($opts{'-final_empty_line'}) {\n \t\t# end with single empty line\n-\t\tprint \"
\\n\" unless $empty;\n+\t\tprint {$output_handler} \"
\\n\" unless $empty;\n \t}\n }\n \n@@ -3754,12 +3768,12 @@ sub git_print_tree_entry {\n \t# the mode of the entry, list is the name of the entry, an href,\n \t# and link is the action links of the entry.\n \n-\tprint \"\" . mode_str($t->{'mode'}) . \"\\n\";\n+\tprint {$output_handler} \"\" . mode_str($t->{'mode'}) . \"\\n\";\n \tif (exists $t->{'size'}) {\n-\t\tprint \"$t->{'size'}\\n\";\n+\t\tprint {$output_handler} \"$t->{'size'}\\n\";\n \t}\n \tif ($t->{'type'} eq \"blob\") {\n-\t\tprint \"\" .\n+\t\tprint {$output_handler} \"\" .\n \t\t\t$cgi->a({-href => href(action=>\"blob\", hash=>$t->{'hash'},\n \t\t\t file_name=>\"$basedir$t->{'name'}\", %base_key),\n \t\t\t -class => \"list\"}, esc_path($t->{'name'}));\n@@ -3768,71 +3782,71 @@ sub git_print_tree_entry {\n \t\t\tif ($link_target) {\n \t\t\t\tmy $norm_target = normalize_link_target($link_target, $basedir);\n \t\t\t\tif (defined $norm_target) {\n-\t\t\t\t\tprint \" -> \" .\n+\t\t\t\t\tprint {$output_handler} \" -> \" .\n \t\t\t\t\t $cgi->a({-href => href(action=>\"object\", hash_base=>$hash_base,\n \t\t\t\t\t file_name=>$norm_target),\n \t\t\t\t\t -title => $norm_target}, esc_path($link_target));\n \t\t\t\t} else {\n-\t\t\t\t\tprint \" -> \" . esc_path($link_target);\n+\t\t\t\t\tprint {$output_handler} \" -> \" . esc_path($link_target);\n \t\t\t\t}\n \t\t\t}\n \t\t}\n-\t\tprint \"\\n\";\n-\t\tprint \"\";\n-\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$t->{'hash'},\n+\t\tprint {$output_handler} \"\\n\";\n+\t\tprint {$output_handler} \"\";\n+\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$t->{'hash'},\n \t\t file_name=>\"$basedir$t->{'name'}\", %base_key)},\n \t\t \"blob\");\n \t\tif ($have_blame) {\n-\t\t\tprint \" | \" .\n+\t\t\tprint {$output_handler} \" | \" .\n \t\t\t $cgi->a({-href => href(action=>\"blame\", hash=>$t->{'hash'},\n \t\t\t file_name=>\"$basedir$t->{'name'}\", %base_key)},\n \t\t\t \"blame\");\n \t\t}\n \t\tif (defined $hash_base) {\n-\t\t\tprint \" | \" .\n+\t\t\tprint {$output_handler} \" | \" .\n \t\t\t $cgi->a({-href => href(action=>\"history\", hash_base=>$hash_base,\n \t\t\t hash=>$t->{'hash'}, file_name=>\"$basedir$t->{'name'}\")},\n \t\t\t \"history\");\n \t\t}\n-\t\tprint \" | \" .\n+\t\tprint {$output_handler} \" | \" .\n \t\t\t$cgi->a({-href => href(action=>\"blob_plain\", hash_base=>$hash_base,\n \t\t\t file_name=>\"$basedir$t->{'name'}\")},\n \t\t\t \"raw\");\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \n \t} elsif ($t->{'type'} eq \"tree\") {\n-\t\tprint \"\";\n-\t\tprint $cgi->a({-href => href(action=>\"tree\", hash=>$t->{'hash'},\n+\t\tprint {$output_handler} \"\";\n+\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"tree\", hash=>$t->{'hash'},\n \t\t file_name=>\"$basedir$t->{'name'}\",\n \t\t %base_key)},\n \t\t esc_path($t->{'name'}));\n-\t\tprint \"\\n\";\n-\t\tprint \"\";\n-\t\tprint $cgi->a({-href => href(action=>\"tree\", hash=>$t->{'hash'},\n+\t\tprint {$output_handler} \"\\n\";\n+\t\tprint {$output_handler} \"\";\n+\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"tree\", hash=>$t->{'hash'},\n \t\t file_name=>\"$basedir$t->{'name'}\",\n \t\t %base_key)},\n \t\t \"tree\");\n \t\tif (defined $hash_base) {\n-\t\t\tprint \" | \" .\n+\t\t\tprint {$output_handler} \" | \" .\n \t\t\t $cgi->a({-href => href(action=>\"history\", hash_base=>$hash_base,\n \t\t\t file_name=>\"$basedir$t->{'name'}\")},\n \t\t\t \"history\");\n \t\t}\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t} else {\n \t\t# unknown object: we can only present history for it\n \t\t# (this includes 'commit' object, i.e. submodule support)\n-\t\tprint \"\" .\n+\t\tprint {$output_handler} \"\" .\n \t\t esc_path($t->{'name'}) .\n \t\t \"\\n\";\n-\t\tprint \"\";\n+\t\tprint {$output_handler} \"\";\n \t\tif (defined $hash_base) {\n-\t\t\tprint $cgi->a({-href => href(action=>\"history\",\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"history\",\n \t\t\t hash_base=>$hash_base,\n \t\t\t file_name=>\"$basedir$t->{'name'}\")},\n \t\t\t \"history\");\n \t\t}\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t}\n }\n \n@@ -3879,13 +3893,13 @@ sub git_difftree_body {\n \tmy ($difftree, $hash, @parents) = @_;\n \tmy ($parent) = $parents[0];\n \tmy $have_blame = gitweb_check_feature('blame');\n-\tprint \"
\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tif ($#{$difftree} > 10) {\n-\t\tprint(($#{$difftree} + 1) . \" files changed:\\n\");\n+\t\tprint {$output_handler} (($#{$difftree} + 1) . \" files changed:\\n\");\n \t}\n-\tprint \"
\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \n-\tprint \" 1 ? \"combined \" : \"\") .\n \t \"diff_tree\\\">\\n\";\n \n@@ -3893,11 +3907,11 @@ sub git_difftree_body {\n \tmy $has_header = @$difftree && @parents > 1 && $action eq 'commitdiff';\n \tif ($has_header) {\n \t\t# table header\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\"; # filename, patchN link\n \t\tfor (my $i = 0; $i < @parents; $i++) {\n \t\t\tmy $par = $parents[$i];\n-\t\t\tprint \"\\n\";\n \t\t}\n-\t\tprint \"\\n\\n\";\n+\t\tprint {$output_handler} \"\\n\\n\";\n \t}\n \n \tmy $alternate = 1;\n@@ -3914,9 +3928,9 @@ sub git_difftree_body {\n \t\tmy $diff = parsed_difftree_line($line);\n \n \t\tif ($alternate) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n \n@@ -3927,14 +3941,14 @@ sub git_difftree_body {\n \n \t\t\tif (!is_deleted($diff)) {\n \t\t\t\t# file exists in the result (child) commit\n-\t\t\t\tprint \"\\n\";\n \t\t\t} else {\n-\t\t\t\tprint \"\\n\";\n \t\t\t}\n@@ -3942,7 +3956,7 @@ sub git_difftree_body {\n \t\t\tif ($action eq 'commitdiff') {\n \t\t\t\t# link to patch\n \t\t\t\t$patchno++;\n-\t\t\t\tprint \"\\n\";\n@@ -3960,9 +3974,9 @@ sub git_difftree_body {\n \t\t\t\t$not_deleted ||= ($status ne 'D');\n \n \t\t\t\tif ($status eq 'A') {\n-\t\t\t\t\tprint \"\\n\";\n+\t\t\t\t\tprint {$output_handler} \"\\n\";\n \t\t\t\t} elsif ($status eq 'D') {\n-\t\t\t\t\tprint \"\\n\";\n \t\t\t\t} else {\n \t\t\t\t\tif ($diff->{'to_id'} eq $from_hash) {\n-\t\t\t\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t\tnext; # instead of 'else' clause, to avoid extra indent\n \t\t}\n \t\t# else ordinary diff\n@@ -4030,51 +4044,51 @@ sub git_difftree_body {\n \t\t\tmy $mode_chng = \"[new $to_file_type\";\n \t\t\t$mode_chng .= \" with mode: $to_mode_str\" if $to_mode_str;\n \t\t\t$mode_chng .= \"]\";\n-\t\t\tprint \"\\n\";\n-\t\t\tprint \"\\n\";\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \n \t\t} elsif ($diff->{'status'} eq \"D\") { # deleted\n \t\t\tmy $mode_chng = \"[deleted $from_file_type]\";\n-\t\t\tprint \"\\n\";\n-\t\t\tprint \"\\n\";\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \n \t\t} elsif ($diff->{'status'} eq \"M\" || $diff->{'status'} eq \"T\") { # modified, or type changed\n \t\t\tmy $mode_chnge = \"\";\n@@ -4092,39 +4106,39 @@ sub git_difftree_body {\n \t\t\t\t}\n \t\t\t\t$mode_chnge .= \"]\\n\";\n \t\t\t}\n-\t\t\tprint \"\\n\";\n-\t\t\tprint \"\\n\";\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \n \t\t} elsif ($diff->{'status'} eq \"R\" || $diff->{'status'} eq \"C\") { # renamed or copied\n \t\t\tmy %status_name = ('R' => 'moved', 'C' => 'copied');\n@@ -4134,7 +4148,7 @@ sub git_difftree_body {\n \t\t\t\t# mode also for directories, so we cannot use $to_mode_str\n \t\t\t\t$mode_chng = sprintf(\", mode: %04o\", $to_mode_oct & 0777);\n \t\t\t}\n-\t\t\tprint \"\\n\" .\n@@ -4147,35 +4161,35 @@ sub git_difftree_body {\n \t\t\tif ($action eq 'commitdiff') {\n \t\t\t\t# link to patch\n \t\t\t\t$patchno++;\n-\t\t\t\tprint $cgi->a({-href => \"#patch$patchno\"}, \"patch\") .\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => \"#patch$patchno\"}, \"patch\") .\n \t\t\t\t \" | \";\n \t\t\t} elsif ($diff->{'to_id'} ne $diff->{'from_id'}) {\n \t\t\t\t# \"commit\" view and modified file (not only pure rename or copy)\n-\t\t\t\tprint $cgi->a({-href => href(action=>\"blobdiff\",\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blobdiff\",\n \t\t\t\t hash=>$diff->{'to_id'}, hash_parent=>$diff->{'from_id'},\n \t\t\t\t hash_base=>$hash, hash_parent_base=>$parent,\n \t\t\t\t file_name=>$diff->{'to_file'}, file_parent=>$diff->{'from_file'})},\n \t\t\t\t \"diff\") .\n \t\t\t\t \" | \";\n \t\t\t}\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n \t\t\t hash_base=>$parent, file_name=>$diff->{'to_file'})},\n \t\t\t \"blob\") . \" | \";\n \t\t\tif ($have_blame) {\n-\t\t\t\tprint $cgi->a({-href => href(action=>\"blame\", hash_base=>$hash,\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blame\", hash_base=>$hash,\n \t\t\t\t file_name=>$diff->{'to_file'})},\n \t\t\t\t \"blame\") . \" | \";\n \t\t\t}\n-\t\t\tprint $cgi->a({-href => href(action=>\"history\", hash_base=>$hash,\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"history\", hash_base=>$hash,\n \t\t\t file_name=>$diff->{'to_file'})},\n \t\t\t \"history\");\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \n \t\t} # we should not encounter Unmerged (U) or Unknown (X) status\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t}\n-\tprint \"\" if $has_header;\n-\tprint \"
\" .\n+\t\t\tprint {$output_handler} \"\" .\n \t\t\t $cgi->a({-href => href(action=>\"commitdiff\",\n \t\t\t hash=>$hash, hash_parent=>$par),\n \t\t\t -title => 'commitdiff to parent number ' .\n@@ -3905,7 +3919,7 @@ sub git_difftree_body {\n \t\t\t $i+1) .\n \t\t\t \" 
\" .\n+\t\t\t\tprint {$output_handler} \"\" .\n \t\t\t\t $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n \t\t\t\t file_name=>$diff->{'to_file'},\n \t\t\t\t hash_base=>$hash),\n \t\t\t\t -class => \"list\"}, esc_path($diff->{'to_file'})) .\n \t\t\t\t \"\" .\n+\t\t\t\tprint {$output_handler} \"\" .\n \t\t\t\t esc_path($diff->{'to_file'}) .\n \t\t\t\t \"\" .\n+\t\t\t\tprint {$output_handler} \"\" .\n \t\t\t\t $cgi->a({-href => \"#patch$patchno\"}, \"patch\") .\n \t\t\t\t \" | \" .\n \t\t\t\t \" | | \" .\n+\t\t\t\t\tprint {$output_handler} \"\" .\n \t\t\t\t\t $cgi->a({-href => href(action=>\"blob\",\n \t\t\t\t\t hash_base=>$hash,\n \t\t\t\t\t hash=>$from_hash,\n@@ -3971,11 +3985,11 @@ sub git_difftree_body {\n \t\t\t\t\t \" | \";\n+\t\t\t\t\t\tprint {$output_handler} \"\";\n \t\t\t\t\t} else {\n-\t\t\t\t\t\tprint \"\";\n+\t\t\t\t\t\tprint {$output_handler} \"\";\n \t\t\t\t\t}\n-\t\t\t\t\tprint $cgi->a({-href => href(action=>\"blobdiff\",\n+\t\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blobdiff\",\n \t\t\t\t\t hash=>$diff->{'to_id'},\n \t\t\t\t\t hash_parent=>$from_hash,\n \t\t\t\t\t hash_base=>$hash,\n@@ -3987,24 +4001,24 @@ sub git_difftree_body {\n \t\t\t\t}\n \t\t\t}\n \n-\t\t\tprint \"\";\n+\t\t\tprint {$output_handler} \"\";\n \t\t\tif ($not_deleted) {\n-\t\t\t\tprint $cgi->a({-href => href(action=>\"blob\",\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\",\n \t\t\t\t hash=>$diff->{'to_id'},\n \t\t\t\t file_name=>$diff->{'to_file'},\n \t\t\t\t hash_base=>$hash)},\n \t\t\t\t \"blob\");\n-\t\t\t\tprint \" | \" if ($has_history);\n+\t\t\t\tprint {$output_handler} \" | \" if ($has_history);\n \t\t\t}\n \t\t\tif ($has_history) {\n-\t\t\t\tprint $cgi->a({-href => href(action=>\"history\",\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"history\",\n \t\t\t\t file_name=>$diff->{'to_file'},\n \t\t\t\t hash_base=>$hash)},\n \t\t\t\t \"history\");\n \t\t\t}\n-\t\t\tprint \"
\";\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n+\t\t\tprint {$output_handler} \"\";\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n \t\t\t hash_base=>$hash, file_name=>$diff->{'file'}),\n \t\t\t -class => \"list\"}, esc_path($diff->{'file'}));\n-\t\t\tprint \"$mode_chng\";\n+\t\t\tprint {$output_handler} \"$mode_chng\";\n \t\t\tif ($action eq 'commitdiff') {\n \t\t\t\t# link to patch\n \t\t\t\t$patchno++;\n-\t\t\t\tprint $cgi->a({-href => \"#patch$patchno\"}, \"patch\");\n-\t\t\t\tprint \" | \";\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => \"#patch$patchno\"}, \"patch\");\n+\t\t\t\tprint {$output_handler} \" | \";\n \t\t\t}\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n \t\t\t hash_base=>$hash, file_name=>$diff->{'file'})},\n \t\t\t \"blob\");\n-\t\t\tprint \"\";\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'from_id'},\n+\t\t\tprint {$output_handler} \"\";\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'from_id'},\n \t\t\t hash_base=>$parent, file_name=>$diff->{'file'}),\n \t\t\t -class => \"list\"}, esc_path($diff->{'file'}));\n-\t\t\tprint \"$mode_chng\";\n+\t\t\tprint {$output_handler} \"$mode_chng\";\n \t\t\tif ($action eq 'commitdiff') {\n \t\t\t\t# link to patch\n \t\t\t\t$patchno++;\n-\t\t\t\tprint $cgi->a({-href => \"#patch$patchno\"}, \"patch\");\n-\t\t\t\tprint \" | \";\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => \"#patch$patchno\"}, \"patch\");\n+\t\t\t\tprint {$output_handler} \" | \";\n \t\t\t}\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'from_id'},\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'from_id'},\n \t\t\t hash_base=>$parent, file_name=>$diff->{'file'})},\n \t\t\t \"blob\") . \" | \";\n \t\t\tif ($have_blame) {\n-\t\t\t\tprint $cgi->a({-href => href(action=>\"blame\", hash_base=>$parent,\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blame\", hash_base=>$parent,\n \t\t\t\t file_name=>$diff->{'file'})},\n \t\t\t\t \"blame\") . \" | \";\n \t\t\t}\n-\t\t\tprint $cgi->a({-href => href(action=>\"history\", hash_base=>$parent,\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"history\", hash_base=>$parent,\n \t\t\t file_name=>$diff->{'file'})},\n \t\t\t \"history\");\n-\t\t\tprint \"\";\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n+\t\t\tprint {$output_handler} \"\";\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n \t\t\t hash_base=>$hash, file_name=>$diff->{'file'}),\n \t\t\t -class => \"list\"}, esc_path($diff->{'file'}));\n-\t\t\tprint \"$mode_chnge\";\n+\t\t\tprint {$output_handler} \"$mode_chnge\";\n \t\t\tif ($action eq 'commitdiff') {\n \t\t\t\t# link to patch\n \t\t\t\t$patchno++;\n-\t\t\t\tprint $cgi->a({-href => \"#patch$patchno\"}, \"patch\") .\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => \"#patch$patchno\"}, \"patch\") .\n \t\t\t\t \" | \";\n \t\t\t} elsif ($diff->{'to_id'} ne $diff->{'from_id'}) {\n \t\t\t\t# \"commit\" view and modified file (not onlu mode changed)\n-\t\t\t\tprint $cgi->a({-href => href(action=>\"blobdiff\",\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blobdiff\",\n \t\t\t\t hash=>$diff->{'to_id'}, hash_parent=>$diff->{'from_id'},\n \t\t\t\t hash_base=>$hash, hash_parent_base=>$parent,\n \t\t\t\t file_name=>$diff->{'file'})},\n \t\t\t\t \"diff\") .\n \t\t\t\t \" | \";\n \t\t\t}\n-\t\t\tprint $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blob\", hash=>$diff->{'to_id'},\n \t\t\t hash_base=>$hash, file_name=>$diff->{'file'})},\n \t\t\t \"blob\") . \" | \";\n \t\t\tif ($have_blame) {\n-\t\t\t\tprint $cgi->a({-href => href(action=>\"blame\", hash_base=>$hash,\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"blame\", hash_base=>$hash,\n \t\t\t\t file_name=>$diff->{'file'})},\n \t\t\t\t \"blame\") . \" | \";\n \t\t\t}\n-\t\t\tprint $cgi->a({-href => href(action=>\"history\", hash_base=>$hash,\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"history\", hash_base=>$hash,\n \t\t\t file_name=>$diff->{'file'})},\n \t\t\t \"history\");\n-\t\t\tprint \"\" .\n+\t\t\tprint {$output_handler} \"\" .\n \t\t\t $cgi->a({-href => href(action=>\"blob\", hash_base=>$hash,\n \t\t\t hash=>$diff->{'to_id'}, file_name=>$diff->{'to_file'}),\n \t\t\t -class => \"list\"}, esc_path($diff->{'to_file'})) . \"
\\n\";\n+\tprint {$output_handler} \"\" if $has_header;\n+\tprint {$output_handler} \"\\n\";\n }\n \n sub git_patchset_body {\n@@ -4190,7 +4204,7 @@ sub git_patchset_body {\n \tmy $to_name;\n \tmy (%from, %to);\n \n-\tprint \"
\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \n \t# skip to first patch\n \twhile ($patch_line = <$fd>) {\n@@ -4218,7 +4232,7 @@ sub git_patchset_body {\n \t\t# and parse raw git-diff line if needed\n \t\tif (is_patch_split($diffinfo, { 'to_file' => $to_name })) {\n \t\t\t# this is continuation of a split patch\n-\t\t\tprint \"
\\n\";\n+\t\t\tprint {$output_handler} \"
\\n\";\n \t\t} else {\n \t\t\t# advance raw git-diff output if needed\n \t\t\t$patch_idx++ if defined $diffinfo;\n@@ -4230,7 +4244,7 @@ sub git_patchset_body {\n \t\t\t# find which patch (using pathname of result) we are at now;\n \t\t\tif ($is_combined) {\n \t\t\t\twhile ($to_name ne $diffinfo->{'to_file'}) {\n-\t\t\t\t\tprint \"
\\n\" .\n+\t\t\t\t\tprint {$output_handler} \"
\\n\" .\n \t\t\t\t\t format_diff_cc_simplified($diffinfo, @hash_parents) .\n \t\t\t\t\t \"
\\n\"; # class=\"patch\"\n \n@@ -4247,7 +4261,7 @@ sub git_patchset_body {\n \n \t\t\t# this is first patch for raw difftree line with $patch_idx index\n \t\t\t# we index @$difftree array from 0, but number patches from 1\n-\t\t\tprint \"
\\n\";\n+\t\t\tprint {$output_handler} \"
\\n\";\n \t\t}\n \n \t\t# git diff header\n@@ -4255,25 +4269,25 @@ sub git_patchset_body {\n \t\t#assert($patch_line !~ m!$/$!) if DEBUG; # is chomp-ed\n \t\t$patch_number++;\n \t\t# print \"git diff\" header\n-\t\tprint format_git_diff_header_line($patch_line, $diffinfo,\n+\t\tprint {$output_handler} format_git_diff_header_line($patch_line, $diffinfo,\n \t\t \\%from, \\%to);\n \n \t\t# print extended diff header\n-\t\tprint \"
\\n\";\n+\t\tprint {$output_handler} \"
\\n\";\n \tEXTENDED_HEADER:\n \t\twhile ($patch_line = <$fd>) {\n \t\t\tchomp $patch_line;\n \n \t\t\tlast EXTENDED_HEADER if ($patch_line =~ m/^--- |^diff /);\n \n-\t\t\tprint format_extended_diff_header_line($patch_line, $diffinfo,\n+\t\t\tprint {$output_handler} format_extended_diff_header_line($patch_line, $diffinfo,\n \t\t\t \\%from, \\%to);\n \t\t}\n-\t\tprint \"
\\n\"; # class=\"diff extended_header\"\n+\t\tprint {$output_handler} \"
\\n\"; # class=\"diff extended_header\"\n \n \t\t# from-file/to-file diff header\n \t\tif (! $patch_line) {\n-\t\t\tprint \"
\\n\"; # class=\"patch\"\n+\t\t\tprint {$output_handler} \"
\\n\"; # class=\"patch\"\n \t\t\tlast PATCH;\n \t\t}\n \t\tnext PATCH if ($patch_line =~ m/^diff /);\n@@ -4284,7 +4298,7 @@ sub git_patchset_body {\n \t\tchomp $patch_line;\n \t\t#assert($patch_line =~ m/^\\+\\+\\+/) if DEBUG;\n \n-\t\tprint format_diff_from_to_header($last_patch_line, $patch_line,\n+\t\tprint {$output_handler} format_diff_from_to_header($last_patch_line, $patch_line,\n \t\t $diffinfo, \\%from, \\%to,\n \t\t @hash_parents);\n \n@@ -4295,11 +4309,11 @@ sub git_patchset_body {\n \n \t\t\tnext PATCH if ($patch_line =~ m/^diff /);\n \n-\t\t\tprint format_diff_line($patch_line, \\%from, \\%to);\n+\t\t\tprint {$output_handler} format_diff_line($patch_line, \\%from, \\%to);\n \t\t}\n \n \t} continue {\n-\t\tprint \"
\\n\"; # class=\"patch\"\n+\t\tprint {$output_handler} \"
\\n\"; # class=\"patch\"\n \t}\n \n \t# for compact combined (--cc) format, with chunk and patch simpliciaction\n@@ -4311,7 +4325,7 @@ sub git_patchset_body {\n \t\t$diffinfo = parsed_difftree_line($difftree->[$patch_idx]);\n \n \t\t# generate anchor for \"patch\" links in difftree / whatchanged part\n-\t\tprint \"
\\n\" .\n+\t\tprint {$output_handler} \"
\\n\" .\n \t\t format_diff_cc_simplified($diffinfo, @hash_parents) .\n \t\t \"
\\n\"; # class=\"patch\"\n \n@@ -4320,13 +4334,13 @@ sub git_patchset_body {\n \n \tif ($patch_number == 0) {\n \t\tif (@hash_parents > 1) {\n-\t\t\tprint \"
Trivial merge
\\n\";\n+\t\t\tprint {$output_handler} \"
Trivial merge
\\n\";\n \t\t} else {\n-\t\t\tprint \"
No differences found
\\n\";\n+\t\t\tprint {$output_handler} \"
No differences found
\\n\";\n \t\t}\n \t}\n \n-\tprint \"
\\n\"; # class=\"patchset\"\n+\tprint {$output_handler} \"
\\n\"; # class=\"patchset\"\n }\n \n # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n@@ -4375,7 +4389,7 @@ sub fill_project_list_info {\n # print 'sort by' element, generating 'sort by $name' replay link\n # if that order is not selected\n sub print_sort_th {\n-\tprint get_sort_th(@_);\n+\tprint {$output_handler} get_sort_th(@_);\n }\n \n sub get_sort_th {\n@@ -4428,20 +4442,20 @@ sub git_project_list_body {\n \t\t\t}\n \t\t}\n \t\tmy $cloud = git_populate_project_tagcloud(\\%ctags);\n-\t\tprint git_show_project_tagcloud($cloud, 64);\n+\t\tprint {$output_handler} git_show_project_tagcloud($cloud, 64);\n \t}\n \n-\tprint \"\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tunless ($no_header) {\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t\tif ($check_forks) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n-\t\tprint_sort_th('project', $order, 'Project');\n-\t\tprint_sort_th('descr', $order, 'Description');\n-\t\tprint_sort_th('owner', $order, 'Owner');\n-\t\tprint_sort_th('age', $order, 'Last Change');\n-\t\tprint \"\\n\" . # for links\n+\t\tprint {$output_handler} get_sort_th('project', $order, 'Project');\n+\t\tprint {$output_handler} get_sort_th('descr', $order, 'Description');\n+\t\tprint {$output_handler} get_sort_th('owner', $order, 'Owner');\n+\t\tprint {$output_handler} get_sort_th('age', $order, 'Last Change');\n+\t\tprint {$output_handler} \"\\n\" . # for links\n \t\t \"\\n\";\n \t}\n \tmy $alternate = 1;\n@@ -4461,26 +4475,26 @@ sub git_project_list_body {\n \t\t}\n \n \t\tif ($alternate) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n \t\tif ($check_forks) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\".\n \t\t \"\\n\" .\n \t\t \"\\n\";\n-\t\tprint \"\\n\" .\n \t\t \"\\n\";\n \t}\n \tif (defined $extra) {\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t\tif ($check_forks) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\";\n \t}\n-\tprint \"
\";\n+\t\t\tprint {$output_handler} \"\";\n \t\t\tif ($pr->{'forks'}) {\n-\t\t\t\tprint \"\\n\";\n-\t\t\t\tprint $cgi->a({-href => href(project=>$pr->{'path'}, action=>\"forks\")}, \"+\");\n+\t\t\t\tprint {$output_handler} \"\\n\";\n+\t\t\t\tprint {$output_handler} $cgi->a({-href => href(project=>$pr->{'path'}, action=>\"forks\")}, \"+\");\n \t\t\t}\n-\t\t\tprint \"\" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>\"summary\"),\n-\t\t -class => \"list\"}, esc_html($pr->{'path'})) . \"\" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>\"summary\"),\n+\t\t -class => \"list\"}, esc_html($pr->{'path'})) .\"\" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>\"summary\"),\n \t\t -class => \"list\", -title => $pr->{'descr_long'}},\n \t\t esc_html($pr->{'descr'})) . \"\" . chop_and_escape_str($pr->{'owner'}, 15) . \"{'age'}) . \"\\\">\" .\n+\t\tprint {$output_handler} \"{'age'}) . \"\\\">\" .\n \t\t (defined $pr->{'age_string'} ? $pr->{'age_string'} : \"No commits\") . \"\" .\n \t\t $cgi->a({-href => href(project=>$pr->{'path'}, action=>\"summary\")}, \"summary\") . \" | \" .\n@@ -4492,14 +4506,14 @@ sub git_project_list_body {\n \t\t \"
$extra$extra
\\n\";\n+\tprint {$output_handler} \"\\n\";\n }\n \n sub git_log_body {\n@@ -4519,7 +4533,7 @@ sub git_log_body {\n \t\t \"$co{'age_string'}\" .\n \t\t esc_html($co{'title'}) . $ref,\n \t\t $commit);\n-\t\tprint \"
\\n\" .\n+\t\tprint {$output_handler} \"
\\n\" .\n \t\t \"
\\n\" .\n \t\t $cgi->a({-href => href(action=>\"commit\", hash=>$commit)}, \"commit\") .\n \t\t \" | \" .\n@@ -4529,16 +4543,16 @@ sub git_log_body {\n \t\t \"
\\n\" .\n \t\t \"
\\n\";\n \t\t git_print_authorship(\\%co, -tag => 'span');\n-\t\t print \"
\\n
\\n\";\n+\t\t print {$output_handler} \"
\\n
\\n\";\n \n-\t\tprint \"
\\n\";\n+\t\tprint {$output_handler} \"
\\n\";\n \t\tgit_print_log($co{'comment'}, -final_empty_line=> 1);\n-\t\tprint \"
\\n\";\n+\t\tprint {$output_handler} \"
\\n\";\n \t}\n \tif ($extra) {\n-\t\tprint \"
\\n\";\n-\t\tprint \"$extra\\n\";\n-\t\tprint \"
\\n\";\n+\t\tprint {$output_handler} \"
\\n\";\n+\t\tprint {$output_handler} \"$extra\\n\";\n+\t\tprint {$output_handler} \"
\\n\";\n \t}\n }\n \n@@ -4549,41 +4563,41 @@ sub git_shortlog_body {\n \t$from = 0 unless defined $from;\n \t$to = $#{$commitlist} if (!defined $to || $#{$commitlist} < $to);\n \n-\tprint \"\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tmy $alternate = 1;\n \tfor (my $i = $from; $i <= $to; $i++) {\n \t\tmy %co = %{$commitlist->[$i]};\n \t\tmy $commit = $co{'id'};\n \t\tmy $ref = format_ref_marker($refs, $commit);\n \t\tif ($alternate) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n \t\t# git_summary() used print \"\\n\" .\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t format_author_html('td', \\%co, 10) . \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\";\n \t}\n \tif (defined $extra) {\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n \t\t \"\\n\";\n \t}\n-\tprint \"
$co{'age_string'}$co{'age_string_date'}$co{'age_string_date'}\";\n-\t\tprint format_subject_html($co{'title'}, $co{'title_short'},\n+\t\tprint {$output_handler} format_subject_html($co{'title'}, $co{'title_short'},\n \t\t href(action=>\"commit\", hash=>$commit), $ref);\n-\t\tprint \"\" .\n \t\t $cgi->a({-href => href(action=>\"commit\", hash=>$commit)}, \"commit\") . \" | \" .\n \t\t $cgi->a({-href => href(action=>\"commitdiff\", hash=>$commit)}, \"commitdiff\") . \" | \" .\n \t\t $cgi->a({-href => href(action=>\"tree\", hash=>$commit, hash_base=>$commit)}, \"tree\");\n \t\tmy $snapshot_links = format_snapshot_links($commit);\n \t\tif (defined $snapshot_links) {\n-\t\t\tprint \" | \" . $snapshot_links;\n+\t\t\tprint {$output_handler} \" | \" . $snapshot_links;\n \t\t}\n-\t\tprint \"
$extra
\\n\";\n+\tprint {$output_handler} \"\\n\";\n }\n \n sub git_history_body {\n@@ -4594,7 +4608,7 @@ sub git_history_body {\n \t$from = 0 unless defined $from;\n \t$to = $#{$commitlist} unless (defined $to && $to <= $#{$commitlist});\n \n-\tprint \"\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tmy $alternate = 1;\n \tfor (my $i = $from; $i <= $to; $i++) {\n \t\tmy %co = %{$commitlist->[$i]};\n@@ -4606,18 +4620,18 @@ sub git_history_body {\n \t\tmy $ref = format_ref_marker($refs, $commit);\n \n \t\tif ($alternate) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t# shortlog: format_author_html('td', \\%co, 10)\n \t\t format_author_html('td', \\%co, 15, 3) . \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\";\n \t}\n \tif (defined $extra) {\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n \t\t \"\\n\";\n \t}\n-\tprint \"
$co{'age_string_date'}$co{'age_string_date'}\";\n \t\t# originally git_history used chop_str($co{'title'}, 50)\n-\t\tprint format_subject_html($co{'title'}, $co{'title_short'},\n+\t\tprint {$output_handler} format_subject_html($co{'title'}, $co{'title_short'},\n \t\t href(action=>\"commit\", hash=>$commit), $ref);\n-\t\tprint \"\" .\n \t\t $cgi->a({-href => href(action=>$ftype, hash_base=>$commit, file_name=>$file_name)}, $ftype) . \" | \" .\n \t\t $cgi->a({-href => href(action=>\"commitdiff\", hash=>$commit)}, \"commitdiff\");\n@@ -4627,7 +4641,7 @@ sub git_history_body {\n \t\t\tmy $blob_parent = git_get_hash_by_path($commit, $file_name);\n \t\t\tif (defined $blob_current && defined $blob_parent &&\n \t\t\t\t\t$blob_current ne $blob_parent) {\n-\t\t\t\tprint \" | \" .\n+\t\t\t\tprint {$output_handler} \" | \" .\n \t\t\t\t\t$cgi->a({-href => href(action=>\"blobdiff\",\n \t\t\t\t\t hash=>$blob_current, hash_parent=>$blob_parent,\n \t\t\t\t\t hash_base=>$hash_base, hash_parent_base=>$commit,\n@@ -4635,15 +4649,15 @@ sub git_history_body {\n \t\t\t\t\t \"diff to current\");\n \t\t\t}\n \t\t}\n-\t\tprint \"
$extra
\\n\";\n+\tprint {$output_handler} \"\\n\";\n }\n \n sub git_tags_body {\n@@ -4652,7 +4666,7 @@ sub git_tags_body {\n \t$from = 0 unless defined $from;\n \t$to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);\n \n-\tprint \"\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tmy $alternate = 1;\n \tfor (my $i = $from; $i <= $to; $i++) {\n \t\tmy $entry = $taglist->[$i];\n@@ -4663,50 +4677,50 @@ sub git_tags_body {\n \t\t\t$comment_short = chop_str($comment, 30, 5);\n \t\t}\n \t\tif ($alternate) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n \t\tif (defined $tag{'age'}) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n-\t\tprint \"\\n\" .\n \t\t \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\";\n \t}\n \tif (defined $extra) {\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n \t\t \"\\n\";\n \t}\n-\tprint \"
$tag{'age'}$tag{'age'}\" .\n+\t\tprint {$output_handler} \"\" .\n \t\t $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'}),\n \t\t -class => \"list name\"}, esc_html($tag{'name'})) .\n \t\t \"\";\n \t\tif (defined $comment) {\n-\t\t\tprint format_subject_html($comment, $comment_short,\n+\t\t\tprint {$output_handler} format_subject_html($comment, $comment_short,\n \t\t\t href(action=>\"tag\", hash=>$tag{'id'}));\n \t\t}\n-\t\tprint \"\";\n \t\tif ($tag{'type'} eq \"tag\") {\n-\t\t\tprint $cgi->a({-href => href(action=>\"tag\", hash=>$tag{'id'})}, \"tag\");\n+\t\t\tprint {$output_handler} $cgi->a({-href => href(action=>\"tag\", hash=>$tag{'id'})}, \"tag\");\n \t\t} else {\n-\t\t\tprint \" \";\n+\t\t\tprint {$output_handler} \" \";\n \t\t}\n-\t\tprint \"\" . \" | \" .\n \t\t $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'})}, $tag{'reftype'});\n \t\tif ($tag{'reftype'} eq \"commit\") {\n-\t\t\tprint \" | \" . $cgi->a({-href => href(action=>\"shortlog\", hash=>$tag{'fullname'})}, \"shortlog\") .\n+\t\t\tprint {$output_handler} \" | \" . $cgi->a({-href => href(action=>\"shortlog\", hash=>$tag{'fullname'})}, \"shortlog\") .\n \t\t\t \" | \" . $cgi->a({-href => href(action=>\"log\", hash=>$tag{'fullname'})}, \"log\");\n \t\t} elsif ($tag{'reftype'} eq \"blob\") {\n-\t\t\tprint \" | \" . $cgi->a({-href => href(action=>\"blob_plain\", hash=>$tag{'refid'})}, \"raw\");\n+\t\t\tprint {$output_handler} \" | \" . $cgi->a({-href => href(action=>\"blob_plain\", hash=>$tag{'refid'})}, \"raw\");\n \t\t}\n-\t\tprint \"
$extra
\\n\";\n+\tprint {$output_handler} \"\\n\";\n }\n \n sub git_heads_body {\n@@ -4715,19 +4729,19 @@ sub git_heads_body {\n \t$from = 0 unless defined $from;\n \t$to = $#{$headlist} if (!defined $to || $#{$headlist} < $to);\n \n-\tprint \"\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tmy $alternate = 1;\n \tfor (my $i = $from; $i <= $to; $i++) {\n \t\tmy $entry = $headlist->[$i];\n \t\tmy %ref = %$entry;\n \t\tmy $curr = $ref{'id'} eq $head;\n \t\tif ($alternate) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t ($curr ? \"\";\n \t}\n \tif (defined $extra) {\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n \t\t \"\\n\";\n \t}\n-\tprint \"
$ref{'age'}$ref{'age'}\" : \"\") .\n \t\t $cgi->a({-href => href(action=>\"shortlog\", hash=>$ref{'fullname'}),\n \t\t -class => \"list name\"},esc_html($ref{'name'})) .\n@@ -4740,11 +4754,11 @@ sub git_heads_body {\n \t\t \"
$extra
\\n\";\n+\tprint {$output_handler} \"\\n\";\n }\n \n sub git_search_grep_body {\n@@ -4752,7 +4766,7 @@ sub git_search_grep_body {\n \t$from = 0 unless defined $from;\n \t$to = $#{$commitlist} if (!defined $to || $#{$commitlist} < $to);\n \n-\tprint \"\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tmy $alternate = 1;\n \tfor (my $i = $from; $i <= $to; $i++) {\n \t\tmy %co = %{$commitlist->[$i]};\n@@ -4761,12 +4775,12 @@ sub git_search_grep_body {\n \t\t}\n \t\tmy $commit = $co{'id'};\n \t\tif ($alternate) {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t} else {\n-\t\t\tprint \"\\n\";\n+\t\t\tprint {$output_handler} \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t format_author_html('td', \\%co, 15, 5) .\n \t\t \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\";\n \t}\n \tif (defined $extra) {\n-\t\tprint \"\\n\" .\n+\t\tprint {$output_handler} \"\\n\" .\n \t\t \"\\n\" .\n \t\t \"\\n\";\n \t}\n-\tprint \"
$co{'age_string_date'}$co{'age_string_date'}\" .\n \t\t $cgi->a({-href => href(action=>\"commit\", hash=>$co{'id'}),\n@@ -4786,25 +4800,25 @@ sub git_search_grep_body {\n \t\t\t\t$match = esc_html($match);\n \t\t\t\t$trail = esc_html($trail);\n \n-\t\t\t\tprint \"$lead$match$trail
\";\n+\t\t\t\tprint {$output_handler} \"$lead$match$trail
\";\n \t\t\t}\n \t\t}\n-\t\tprint \"		\" .\n \t\t $cgi->a({-href => href(action=>\"commit\", hash=>$co{'id'})}, \"commit\") .\n \t\t \" | \" .\n \t\t $cgi->a({-href => href(action=>\"commitdiff\", hash=>$co{'id'})}, \"commitdiff\") .\n \t\t \" | \" .\n \t\t $cgi->a({-href => href(action=>\"tree\", hash=>$co{'tree'}, hash_base=>$co{'id'})}, \"tree\");\n-\t\tprint \"
$extra
\\n\";\n+\tprint {$output_handler} \"\\n\";\n }\n \n ## ======================================================================\n@@ -4824,11 +4838,11 @@ sub git_project_list {\n \n \tgit_header_html();\n \tif (-f $home_text) {\n-\t\tprint \"
\\n\";\n+\t\tprint {$output_handler} \"
\\n\";\n \t\tinsert_file($home_text);\n-\t\tprint \"
\\n\";\n+\t\tprint {$output_handler} \"
\\n\";\n \t}\n-\tprint $cgi->startform(-method => \"get\") .\n+\tprint {$output_handler} $cgi->startform(-method => \"get\") .\n \t \"

Search:\\n\" .\n \t $cgi->textfield(-name => \"s\", -value => $searchtext) . \"\\n\" .\n \t \"

\" .\n@@ -4858,7 +4872,7 @@ sub git_forks {\n sub git_project_index {\n \tmy @projects = git_get_projects_list($project);\n \n-\tprint $cgi->header(\n+\tprint {$output_handler} $cgi->header(\n \t\t-type => 'text/plain',\n \t\t-charset => 'utf-8',\n \t\t-content_disposition => 'inline; filename=\"index.aux\"');\n@@ -4875,7 +4889,7 @@ sub git_project_index {\n \t\t$path =~ s/ /\\+/g;\n \t\t$owner =~ s/ /\\+/g;\n \n-\t\tprint \"$path $owner\\n\";\n+\t\tprint {$output_handler} \"$path $owner\\n\";\n \t}\n }\n \n@@ -4902,12 +4916,12 @@ sub git_summary {\n \tgit_header_html();\n \tgit_print_page_nav('summary','', $head);\n \n-\tprint \"
 
\\n\";\n-\tprint \"\\n\" .\n+\tprint {$output_handler} \"
 
\\n\";\n+\tprint {$output_handler} \"
\\n\" .\n \t \"\\n\" .\n \t \"\\n\";\n \tif (defined $cd{'rfc2822'}) {\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t}\n \n \t# use per project git URL list in $projectroot/$project/cloneurl\n@@ -4917,7 +4931,7 @@ sub git_summary {\n \t@url_list = map { \"$_/$project\" } @git_base_url_list unless @url_list;\n \tforeach my $git_url (@url_list) {\n \t\tnext unless $git_url;\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \t\t$url_tag = \"\";\n \t}\n \n@@ -4926,23 +4940,23 @@ sub git_summary {\n \tif ($show_ctags) {\n \t\tmy $ctags = git_get_project_ctags($project);\n \t\tmy $cloud = git_populate_project_tagcloud($ctags);\n-\t\tprint \"\\n\\n\";\n+\t\tprint {$output_handler} \"\\n\\n\";\n \t}\n \n-\tprint \"
description\" . esc_html($descr) . \"
owner\" . esc_html($owner) . \"
last change$cd{'rfc2822'}
last change$cd{'rfc2822'}
$url_tag$git_url
$url_tag$git_url
Content tags:
\";\n-\t\tprint \"		\" unless %$ctags;\n-\t\tprint \"
Add:
\";\n-\t\tprint \"		\" if %$ctags;\n-\t\tprint git_show_project_tagcloud($cloud, 48);\n-\t\tprint \"
Content tags:
\";\n+\t\tprint {$output_handler} \"		\" unless %$ctags;\n+\t\tprint {$output_handler} \"
Add:
\";\n+\t\tprint {$output_handler} \"		\" if %$ctags;\n+\t\tprint {$output_handler} git_show_project_tagcloud($cloud, 48);\n+\t\tprint {$output_handler} \"
\\n\";\n+\tprint {$output_handler} \"\\n\";\n \n \t# If XSS prevention is on, we don't include README.html.\n \t# TODO: Allow a readme in some safe format.\n \tif (!$prevent_xss && -s \"$projectroot/$project/README.html\") {\n-\t\tprint \"
readme
\\n\" .\n+\t\tprint {$output_handler} \"
readme
\\n\" .\n \t\t \"
\\n\";\n \t\tinsert_file(\"$projectroot/$project/README.html\");\n-\t\tprint \"\\n
\\n\"; # class=\"readme\"\n+\t\tprint {$output_handler} \"\\n
\\n\"; # class=\"readme\"\n \t}\n \n \t# we need to request one more than 16 (0..15) to check if\n@@ -4991,7 +5005,7 @@ sub git_tag {\n \t}\n \n \tgit_print_header_div('commit', esc_html($tag{'name'}), $hash);\n-\tprint \"
\\n\" .\n+\tprint {$output_handler} \"
\\n\" .\n \t \"\\n\" .\n \t \"\\n\" .\n \t \"\\n\" .\n@@ -5003,15 +5017,15 @@ sub git_tag {\n \tif (defined($tag{'author'})) {\n \t\tgit_print_authorship_rows(\\%tag, 'author');\n \t}\n-\tprint \"
object
\\n\\n\" .\n+\tprint {$output_handler} \"\\n\\n\" .\n \t \"
\\n\";\n-\tprint \"
\";\n+\tprint {$output_handler} \"
\";\n \tmy $comment = $tag{'comment'};\n \tforeach my $line (@$comment) {\n \t\tchomp $line;\n-\t\tprint esc_html($line, -nbsp=>1) . \"
\\n\";\n+\t\tprint {$output_handler} esc_html($line, -nbsp=>1) . \"
\\n\";\n \t}\n-\tprint \"
\\n\";\n+\tprint {$output_handler} \"
\\n\";\n \tgit_footer_html();\n }\n \n@@ -5062,21 +5076,23 @@ sub git_blame_common {\n \n \t# incremental blame data returns early\n \tif ($format eq 'data') {\n-\t\tprint $cgi->header(\n+\t\tprint {$output_handler} $cgi->header(\n \t\t\t-type=>\"text/plain\", -charset => \"utf-8\",\n \t\t\t-status=> \"200 OK\");\n \t\tlocal $| = 1; # output autoflush\n-\t\tprint while <$fd>;\n+\t\twhile (<$fd>) {\n+\t\t\t print {$output_handler} $_;\n+\t\t}\n \t\tclose $fd\n-\t\t\tor print \"ERROR $!\\n\";\n+\t\t\tor die_error(500, \"ERROR $!\\n\");\n \n-\t\tprint 'END';\n+\t\tprint {$output_handler} 'END';\n \t\tif (defined $t0 && gitweb_check_feature('timed')) {\n-\t\t\tprint ' '.\n+\t\t\tprint {$output_handler} ' '.\n \t\t\t Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).\n \t\t\t ' '.$number_of_git_cmds;\n \t\t}\n-\t\tprint \"\\n\";\n+\t\tprint {$output_handler} \"\\n\";\n \n \t\treturn;\n \t}\n@@ -5109,20 +5125,20 @@ sub git_blame_common {\n \n \t# page body\n \tif ($format eq 'incremental') {\n-\t\tprint \"