summaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeLines
* Merge branch 'stable'Lars Hjemli2012-03-18-7/+5
|\
| * segfault fix on some bogus requestsEric Wong2012-03-18-2/+2
| | | | | | | | | | | | | | | | | | ctx.qry.head can be NULL in some cases due to bad requests by weird bots. I managed to reproduce with: PATH_INFO=/repo.git/shop.php QUERY_STRING=id= Signed-off-by: Eric Wong <normalperson@yhbt.net>
| * use correct type for sizeofJamie Couture2012-03-18-1/+1
| | | | | | | | | | | | | | | | | | **L would have worked well too. Depending on the distribution sizeof *L may return 8 instead of 4. **L is preferable, but since we don't expect this datatype to change very often, sizeof int is less subtle and easier to understand. Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
| * ui-ssdiff.c: correct length check for LCS tableEric Wong2012-01-08-4/+2
| | | | | | | | | | | | | | Each individual string may be too long for its respective dimension of the LCS table. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* | Merge branch 'stable'Lars Hjemli2012-01-03-1/+1
|\|
| * Fix segmentation fault in empty repositoryJohn Keeping2012-01-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | When a repository is empty, the ATOM feed link is written in the header, but this involves formatting ctx->qry.head which is NULL in this case. With glibc, vsnprintf formats "%s" with a NULL input as "(null)" but on Solaris this results in a segmentation fault. Since we don't have a meaningful head for the atom feed in an empty repository, it's simplest not to write out the link element at all. Signed-off-by: John Keeping <john@metanate.com>
* | Merge branch 'stable'Lars Hjemli2012-01-03-3/+3
|\|
| * Makefile: fetch git tarballs from http://hjemli.net/git/git/Lars Hjemli2012-01-03-1/+1
| | | | | | | | | | | | | | The git tarballs are currently not available from kernel.org, so for now the makefile will download autogenerated tarballs from cgit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * fix css color value and vertical-align valueNorberto Lopes2012-01-03-2/+2
| |
* | ui-ssdiff.c: set correct diffmode in "control panel"Tim Chen2012-01-03-3/+1
| | | | | | | | | | | | When side-by-side-diffs=1 was set in cgitrc, specifying 'ss=0' in the querystring would not set the 'unified' option as active in the dropdown box used to select diffmode.
* | Merge branch 'stable'Lars Hjemli2012-01-03-17/+68
|\|
| * Fix diff mode switching when side-by-side-diffs=1Tim Chen2012-01-03-2/+3
| | | | | | | | | | | | | | When side-by-side-diffs=1 was set in cgitrc, specyfing 'ss=0' in the query- string would not switch to unified diffs. This patch fixes the issue by introducing a separate variable to track the occurrence of "ss" in the querystring.
| * ui-log.c: do not show remote heads if enable-remote-branches=0Georg Müller2012-01-03-0/+3
| | | | | | | | | | If remote branches are not enabled, the branches are still listed in the log view. This patch removes them if enable-remote-branches=0.
| * Add sort parameter to pager of repo listTobias Grimm2012-01-03-13/+19
| | | | | | | | | | | | When the repolist is paged, the page-links are missing the sort parameter, causing the initial page to be custom sorted, but any clicked page will then be with the default sort order again.
| * ui-ssdiff: move LCS table away from the stackJamie Couture2012-01-03-2/+43
| | | | | | | | | | | | | | | | | | | | | | Printing deferred line changes for files containing long lines would cause a segfault. - limit LCS table size: 128x128. - move LCS table to global context: avoid allocating/freeing memory for every deferred line change. Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
* | shared.c: Only setenv() if value is non-nullLukas Fleischer2012-01-03-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some setenv() implementations (e.g. the one in OpenBSD's stdlib) segfault if we pass a NULL value. Only set environment variables if the corresponding settings are defined to avoid this. Note that this is a minor behaviour change as environment variables were supposed to be set to an empty string if a setting was undefined. Given that this feature isn't part of any official release yet, there's no need to worry about backwards compatibility, really. Change the documentation accordingly. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* | shared.c: Remove unused "linux/limits.h" includeLukas Fleischer2012-01-03-1/+0
| | | | | | | | | | | | | | This isn't used anywhere and prevents the code from being compiled on other platforms, such as *BSD. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* | Merge branch 'stable'Lars Hjemli2011-07-22-5/+7
|\|
| * Fix potential XSS vulnerability in rename hintLukas Fleischer2011-07-22-4/+6
| | | | | | | | | | | | | | | | | | The file name displayed in the rename hint should be escaped to avoid XSS. Note that this vulnerability is only applicable when an attacker has gained push access to the repository. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * Remove dead initialization in cgit_parse_commit()Lukas Fleischer2011-07-22-1/+1
| | | | | | | | | | | | | | | | The value stored to "t" during its initialization gets overwritten in any case, so just leave it uninitialized. Spotted by clang-analyzer. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-07-21-3/+3
|\|
| * CGIT 0.9.0.2Lars Hjemli2011-07-21-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * html.c: avoid out-of-bounds access for url_escape_tableEric Wong2011-07-21-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a segfault for me with with -O2 optimization on x86 with gcc (Debian 4.4.5-8) 4.4.5 I can reliably reproduce it with the following parameters when pointed to the git.git repository: PATH_INFO='/git-core.git/diff/' QUERY_STRING='id=2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5&id2=d6da71a9d16b8cf27f9d8f90692d3625c849cbc8' Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-07-21-0/+1
|\|
| * tests: fix failures when CDPATH is setFerry Huberts2011-07-21-0/+1
| | | | | | | | | | | | | | | | | | | | Some tests would otherwise fail because commands such as cd trash/repos/foo && git rev-list --reverse HEAD | head -1 would return 2 lines instead of 1: the 'cd' command also prints the path when CDPATH is set. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Makefile: fix oversight of not using $(DESTDIR) in uninstallFerry Huberts2011-07-19-3/+3
| | | | | | | | | | Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | commit-links.sh: improve regular expressionsFerry Huberts2011-07-19-2/+5
| | | | | | | | | | | | | | | | | | | | | | The default length for sha1 abbreviations in git is 7. A '#num' at the beginning of the commit message is now recognised, a ':#num' as well, etc.: a '#num' anywhere is now converted to a link. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-06-18-1/+5
|\|
| * cgit.c: improve error message when git repo cannot be accessedLars Hjemli2011-06-18-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The current 'Not a git repository' error message is not very helpful, since it doesn't state the cause of the problem. This patch uses errno to provide a hint of the underlying problem. It would have been even better to give the exact cause (e.g. for ENOENT it would be nice to know which file/directory is missing), but that would require reimplementing setup_git_directory_gently() which seems a bit overkill. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-06-15-0/+6
|\|
| * cgitrc.5.txt: document repo.module-linkLars Hjemli2011-06-15-0/+6
| | | | | | | | | | | | | | The global module-link option can be overridden per repo, but this has never been documented. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'lh/clone-url'Lars Hjemli2011-06-13-16/+40
|\ \
| * | cgit.c: add 'clone-url' setting with support for macro expansionLars Hjemli2011-06-13-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current 'clone-prefix' setting has some known issues: * All repos get the same 'clone-prefix' value since the setting is not adopted during repo registration (in cgitrc, or during scan-path traversal), but only when the setting is used. * The generated clone-urls for a repo is a combination of 'clone-prefix', a slash and the repo url. This doesn't work well with e.g. ssh-style urls like 'git@example.org:repo.git', since the inserted slash will make the repo relative to the filesystem root. * If 'remove-suffix' is enabled, the generated clone-urls will not work for cloning (except for http-urls to cgit itself) since they miss the '.git' suffix. The new 'clone-url' setting is designed to avoid the mentioned issues: * Each repo adopts the default 'clone-url' when the repo is defined. This allows different groups of repos to adopt different values. * The clone-urls for a repo is generated by expanding environment variables in a string template without inserting arbitrary characters, hence any kind of clone-url can be generated. * Macro expansion also eases the 'remove-suffix' pain since it's now possible to define e.g. 'clone-url=git://foo.org/$CGIT_REPO_URL.git' for a set of repos. A furter improvement would be to define e.g. $CGIT_REPO_SUFFIX to '.git' for all repos which had their url prettified, or to store the original $CGIT_REPO_URL in e.g. $CGIT_REPO_REAL_URL before suffix removal. Reviewed-by: Ferry Huberts <mailings@hupie.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: always setup cgit repo environment variablesLars Hjemli2011-06-13-12/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | When cgit learned to setup environment variables for certain repo settings before invoking a filter process, the setup occurred inside cgit_open_filter(). This patch moves the setup out of cgit_open_filter() and into prepare_repo_cmd() to prepare for additional uses of these variables. Reviewed-by: Ferry Huberts <mailings@hupie.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | cgitrc.5.txt: reformat the "FILTER API" sectionLars Hjemli2011-06-13-26/+24
| | | | | | | | | | | | | | | | | | This patch makes the generated man-page for the filer api section more similar to the other sections. Also, the bulleted list of environment variables wasn't rendered correctly (with asciidoc 8.5.2), without an empty line before the first item. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-06-13-4/+26
|\| | | | | | | | | Conflicts: cgitrc.5.txt
| * cgitrc.5.txt: describe macro expansion of cgitrc optionsLars Hjemli2011-06-13-4/+26
| | | | | | | | | | | | This is a new feature in cgit-0.9 which was formerly undocumented. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-06-13-16/+6
|\|
| * README: update some stale information/add some newLars Hjemli2011-06-13-16/+6
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-06-13-1/+1
|\|
| * CGIT 0.9.0.1Lars Hjemli2011-06-13-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-06-12-19/+46
|\|
| * ui-plain.c: fix html and links generated by print_dir() and print_dir_entry()Lars Hjemli2011-06-12-19/+46
| | | | | | | | | | | | | | | | | | | | | | This patch fixes the following issues: * the base argument usually isn't zero-terminated, so printing base without considering baselen will usually generate random garbage * when the current url represents a directory but doesn't end in a slash, relative urls would be incorrect * using unescaped paths allows XSS Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-06-06-0/+2
|\|
| * scan-tree.c: avoid memory leakJamie Couture2011-06-06-0/+2
| | | | | | | | | | | | | | | | No references are kept to the memory pointed to by the 'rel' variable, so it should be free()'d before returning from add_repo(). Signed-off-by: Jamie Couture <jamie.couture@gmail.com> Signed-off-by: Lars Hjemli <larsh@hjemli.net>
* | Merge branch 'stable'Lars Hjemli2011-06-02-12/+1
|\|
| * ui-log.c: do not link from age columnLars Hjemli2011-06-02-10/+1
| | | | | | | | | | | | | | The link url wasn't properly escaped, and since the link was identical to the one used on the commit message it didn't serve any special purpose. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * ui-snapshot.c: remove debug cruftLars Hjemli2011-06-02-2/+0
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | ui-stats.c: fix invalid htmlLars Hjemli2011-05-30-1/+1
| | | | | | | | | | | | Found by http://validator.w3.org. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2011-05-30-1/+3
|\|
powered by cgit and git | oriole.systems | how to verify signatures