summaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeLines
* Makefile: fix MAKEFLAGS tests with multiple flagsJohn Keeping2015-10-09-1/+1
| | | | | | | | findstring is defined as $(findstring FIND,IN) so if multiple flags are set these tests do the wrong thing unless $(MAKEFLAGS) is the second argument. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-refs: remove useless null checkJohn Keeping2015-10-09-1/+1
| | | | | | | There is no way that "tag" can be null here. Coverity-id: 13950 Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-blob: remove useless null checkJohn Keeping2015-10-09-1/+1
| | | | | | | | We have already called strlen() on "path" by the time we get here, so we know it can't be null. Coverity-id: 13954 Signed-off-by: John Keeping <john@keeping.me.uk>
* scan-tree: remove useless strdup()John Keeping2015-10-09-1/+1
| | | | | | | | | parse_configfile() takes a "const char *" and doesn't hold any references to it after it returns; there is no reason to pass it a duplicate. Coverity-id: 13941 Signed-off-by: John Keeping <john@keeping.me.uk>
* cgit.c: remove useless null checkJohn Keeping2015-10-09-1/+1
| | | | | | | | Everywhere else in this function we do not check whether the value is null and parse_configfile() never passes a null value to this callback. Coverity-id: 13846 Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to v2.6.1Christian Hesse2015-10-06-1/+1
| | | | | | Update to git version v2.6.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* mime: rewrite detection functionJason A. Donenfeld2015-08-17-36/+26
| | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* ui-summary: send images plain for about pageChristian Hesse2015-08-17-2/+13
| | | | | | | | | The about page used to display just fine, but images were broken: The binary image data was embedded in html code. Use cgit_print_plain() to send images in plain mode and make them available on about page. Signed-off-by: Christian Hesse <mail@eworm.de>
* refactor get_mimetype_from_file() to get_mimetype_for_filename()Christian Hesse2015-08-17-51/+44
| | | | | | | * handle mimetype within a single function * return allocated memory on success Signed-off-by: Christian Hesse <mail@eworm.de>
* move get_mimetype_from_file() to sharedChristian Hesse2015-08-17-40/+42
| | | | Signed-off-by: Christian Hesse <mail@eworm.de>
* cmd: fix command definitionJohn Keeping2015-08-14-1/+1
| | | | | | | | The previous commit removed the "pre" field from "struct cgit_cmd" but forgot to update this macro. Signed-off-by: John Keeping <john@keeping.me.uk> Reviewed-by: Christian Hesse <mail@eworm.de>
* cmd: no need for pre function hook nowJason A. Donenfeld2015-08-14-20/+9
| | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* ui-shared: cache errors for "dynamic TTL"John Keeping2015-08-14-0/+1
| | | | | | | Most errors we generate are (potentially) transient, such as non-existent object IDs so we don't want them to be cached forever. Signed-off-by: John Keeping <john@keeping.me.uk>
* cmd: remove "want_layout" fieldJohn Keeping2015-08-14-34/+24
| | | | | | No commands use this any more. Signed-off-by: John Keeping <john@keeping.me.uk>
* tree: move layout into page functionJohn Keeping2015-08-14-6/+19
| | | | | | | | This also allows us to return proper HTTP error codes when the requested tree is not found and display an error message in one case (invalid path inside valid commit) where we previously just displayed an empty page. Signed-off-by: John Keeping <john@keeping.me.uk>
* tag: move layout into page functionJohn Keeping2015-08-14-4/+11
| | | | | | | This also allows us to return proper HTTP error codes when something goes wrong. Signed-off-by: John Keeping <john@keeping.me.uk>
* summary: move layout into page functionJohn Keeping2015-08-14-1/+3
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* stats: move layout into page functionJohn Keeping2015-08-14-3/+7
| | | | | | | This also allows us to return proper HTTP error codes for invalid requests. Signed-off-by: John Keeping <john@keeping.me.uk>
* refs: move layout to page functionJohn Keeping2015-08-14-2/+3
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* log: move layout into page functionJohn Keeping2015-08-14-2/+5
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* diff: move layout to page functionJohn Keeping2015-08-14-6/+15
| | | | | | | The existing "show_ctrls" flag is used to control whether we are running in an existing page or control the page ourselves. Signed-off-by: John Keeping <john@keeping.me.uk>
* commit: move layout into page functionJohn Keeping2015-08-14-3/+7
| | | | | | | This allows us to return a proper HTTP status code when an object is not found by switching from cgit_print_error() to cgit_print_error_page(). Signed-off-by: John Keeping <john@keeping.me.uk>
* about: move layout into page functionsJohn Keeping2015-08-14-4/+11
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: add cgit_print_layout_{start,end}()John Keeping2015-08-14-0/+15
| | | | | | | | These will avoid needing to call three functions to start page layout in subsequent patches when we move the layout setup into each individual page. Signed-off-by: John Keeping <john@keeping.me.uk>
* html: remove html_status()John Keeping2015-08-14-8/+0
| | | | | | This is now unused. Signed-off-by: John Keeping <john@keeping.me.uk>
* snapshot: don't reimplement cgit_print_error_page()John Keeping2015-08-14-17/+4
| | | | | | | | | | cgit_print_error_page() has the advantage that it sets a suitable HTTP status code for the response. Note that setting "mimetype" is redundant here since it cannot have changed since being initialized in cgit.c::prepare_context(), so we do not need to worry that cgit_print_error_page() does not set it. Signed-off-by: John Keeping <john@keeping.me.uk>
* snapshot: use cgit_print_error_page() for HTTP status codesJohn Keeping2015-08-14-2/+4
| | | | | | | | This is a bugfix as well as an improvement to the HTTP status code handling since previously we would not print HTTP headers on any of these code paths. Signed-off-by: John Keeping <john@keeping.me.uk>
* patch: use cgit_print_error_page() for HTTP status codesJohn Keeping2015-08-14-8/+8
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* blob: use cgit_print_error_page() to add HTTP headersJohn Keeping2015-08-14-4/+8
| | | | | | | | This is a bugfix as well as an improvement to the HTTP status code handling since previously we would not print HTTP headers on any of these code paths. Signed-off-by: John Keeping <john@keeping.me.uk>
* snapshot: use cgit_print_error_page() instead of html_status()John Keeping2015-08-14-1/+1
| | | | | | | This provides a formatted error response rather than a simple HTTP error. Signed-off-by: John Keeping <john@keeping.me.uk>
* plain: use cgit_print_error_page() instead of html_status()John Keeping2015-08-14-5/+5
| | | | | | | This provides a formatted error response rather than a simple HTTP error. Signed-off-by: John Keeping <john@keeping.me.uk>
* clone: use cgit_print_error_page() instead of html_status()John Keeping2015-08-14-5/+5
| | | | | | | This provides a formatted error response rather than a simple HTTP error. Signed-off-by: John Keeping <john@keeping.me.uk>
* cgit: use cgit_print_error_page() where appropriateJohn Keeping2015-08-14-20/+7
| | | | | | | | These are more-or-less one-to-one translations but in the final hunk we gain an HTTP error code where we used to send "200 OK", which is an improvement. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: add cgit_print_error_page() functionJohn Keeping2015-08-14-0/+16
| | | | | | | This will allow us to generate error responses with the correct HTTP response code without needing all of the layout boilerplate. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-patch: make sure to send http headersChristian Hesse2015-08-14-0/+4
| | | | | | | | | | Requesting a text/plain patch with bad commit id made cgit send text without proper http headers. This results in "500 Internal Server Error" with "Premature end of script headers" in server logs. So print http headers before error message and return. Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
* Makefile: make "git/config.mak.uname" inclusion optionalJohn Keeping2015-08-13-1/+1
| | | | | | | If we haven't got a "git" directory, it should still be possible to run "make get-git", so we cannot include this file unconditionally. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: show full date in tooltip if longer ago than max_relativeJohn Keeping2015-08-13-0/+4
| | | | | | | | | | | Commit caed6cb (ui-shared: show absolute time in tooltip for relative dates, 2014-12-20) added a toolip when we show a relative time. However, in some cases we show a short date (that is, the date but not the time) if an event was sufficiently far in the past and that commit did not update that case to add the same tooltip. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: use common function in print_rel_date()John Keeping2015-08-13-10/+1
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: extract date formatting to a functionJohn Keeping2015-08-13-4/+9
| | | | | | This will allow this code to be common with print_rel_date. Signed-off-by: John Keeping <john@keeping.me.uk>
* filter: don't use dlsym unnecessarilyJohn Keeping2015-08-13-36/+42
| | | | | | | We only need to hook write() if Lua filter's are in use. If support has been disabled, remove the dependency on dlsym(). Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-tree: use "sane" isgraph()John Keeping2015-08-13-1/+3
| | | | | | | | | | | | | | | | | | Git's git-compat-util.h defines a "sane ctype" that does not use locale information and works with signed chars, but it does not include isgraph() so we have included ctype.h ourselves. However, this means we have to include a system header before git-compat-util.h which may lead to the system defining some macros (e.g. _FILE_OFFSET_BITS on Solaris) before git-compat-util.h redefines them with a different value. We cannot include ctype.h after git-compat-util.h because we have defined many of its functions as macros which causes a stream of compilation errors. Defining our own "sane" isgraph() using Git's sane isprint() and isspace() avoids all of these problems. Signed-off-by: John Keeping <john@keeping.me.uk>
* cgit.h: move stdbool.h from ui-shared.hJohn Keeping2015-08-13-2/+2
| | | | | | Follow the Git policy of including system headers in only one place. Signed-off-by: John Keeping <john@keeping.me.uk>
* cache.c: fix header orderJohn Keeping2015-08-13-3/+3
| | | | | | | | git-compat-util.h may define values that affect how system headers are interpreted, so move sys/sendfile.h after cgit.h (which includes git-compat-util.h). Signed-off-by: John Keeping <john@keeping.me.uk>
* configfile.c: don't include system headers directlyJohn Keeping2015-08-13-2/+1
| | | | | | | | | git-compat-util.h may define various values that affect the interpretation of system headers. In most places we include cgit.h first, which pulls in git-compat-util.h, but this file does not depend on anything else in CGit, so use git-compat-util.h directly. Signed-off-by: John Keeping <john@keeping.me.uk>
* Remove redundant includesJohn Keeping2015-08-13-16/+0
| | | | | | | These are all included in git-compat-util.h (when necessary), which we include in cgit.h. Signed-off-by: John Keeping <john@keeping.me.uk>
* Makefile: include Git's config.mak.unameJohn Keeping2015-08-13-0/+1
| | | | | | | This pulls in the correct value of $(INSTALL) on a wide variety of systems. Signed-off-by: John Keeping <john@keeping.me.uk>
* tests: allow shell to be overriddenJohn Keeping2015-08-13-1/+5
| | | | | | | | | | | On some systems (e.g. Solaris), /bin/sh is not a POSIX shell. Git already provides suitable overrides in its config.mak.uname file and we provide cgit.conf to allow the user to further change this. The code for this is taken from Git's t/Makefile, meaning that we now invoke the tests in the same way that Git does. Signed-off-by: John Keeping <john@keeping.me.uk>
* redirect: cleanlinessJason A. Donenfeld2015-08-13-2/+1
|
* redirect: be more careful for different cgi setupsJason A. Donenfeld2015-08-13-1/+4
|
* ui-log: fix double countingJohn Keeping2015-08-12-2/+2
| | | | | | | This crept in while rebasing the previous commit onto an updated upstream. Signed-off-by: John Keeping <john@keeping.me.uk>
powered by cgit and git | oriole.systems | how to verify signatures