aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* cgitrc.5.txt: reformat the "FILTER API" sectionGravatar Lars Hjemli2011-06-14-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'Gravatar Lars Hjemli2011-06-14-4/+26
|\ | | | | | | | | Conflicts: cgitrc.5.txt
| * cgitrc.5.txt: describe macro expansion of cgitrc optionsGravatar Lars Hjemli2011-06-14-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'Gravatar Lars Hjemli2011-06-13-16/+6
|\ \ | |/
| * README: update some stale information/add some newGravatar Lars Hjemli2011-06-13-16/+6
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2011-06-13-1/+1
|\ \ | |/
| * CGIT 0.9.0.1Gravatar Lars Hjemli2011-06-13-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2011-06-13-19/+46
|\ \ | |/
| * ui-plain.c: fix html and links generated by print_dir() and print_dir_entry()Gravatar Lars Hjemli2011-06-13-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'Gravatar Lars Hjemli2011-06-07-0/+2
|\ \ | |/
| * scan-tree.c: avoid memory leakGravatar Jamie Couture2011-06-07-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'Gravatar Lars Hjemli2011-06-02-12/+1
|\ \ | |/
| * ui-log.c: do not link from age columnGravatar Lars 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 cruftGravatar Lars Hjemli2011-06-02-2/+0
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | ui-stats.c: fix invalid htmlGravatar Lars Hjemli2011-05-31-1/+1
| | | | | | | | | | | | Found by http://validator.w3.org. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2011-05-31-1/+3
|\ \ | |/
| * Properly escape ampersands inside HTML attributesGravatar Lukas Fleischer2011-05-31-1/+3
| | | | | | | | | | | | | | | | | | Ampersands ("&") appearing inside HTML attributes need to be translated to "&amp;". Otherwise, invalid XHTML will be generated at various places, such as at tree views containing links to submodules. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | ui_repolist: get modtime from packed-refs as fallbackGravatar Ferry Huberts2011-05-31-3/+12
| | | | | | | | | | | | | | | | | | | | | | When no modtime could be determined then as a final fallback try to get it from the packed-refs. This will show an idle time when a repository has been packed with all refs in the packed-refs. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'lh/panel'Gravatar Lars Hjemli2011-05-24-62/+124
|\ \
| * | ui-stats.c: create a control panel for stat optionsGravatar Lars Hjemli2011-03-07-24/+27
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-diff.c: create a control panel for diff optionsGravatar Lars Hjemli2011-03-07-38/+88
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | html.c: add html_intoption()Gravatar Lars Hjemli2011-03-07-0/+9
| | | | | | | | | | | | | | | | | | This is similar to html_option, but for int values. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'fh/filter-api'Gravatar Lars Hjemli2011-05-24-21/+127
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: cgit.c
| * | | shared.c: use execvp() to execute filter commandsGravatar Lars Hjemli2011-03-26-57/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reintroduces the use of execvp(), since the filter commands doesn't always contain an absolute path (i.e. snapshot compression filters). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | filters: document environment variables in filter scriptsGravatar Ferry Huberts2011-03-26-5/+64
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | cgit_open_filter: hand down repo configuration to scriptGravatar Ferry Huberts2011-03-26-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The environment variables can be used to (for example) resolve the following situation: Suppose a server setup in which each repository has a trac instance; the commit filter needs to know with which repository it's dealing in order to be able to resolve the #123 ticket numbers in the commit messages into hyperlinks into the correct trac instance. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | cgit_open_filter: also take the repo as a parameterGravatar Ferry Huberts2011-03-26-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prepare for handing repo configuration to the filter script that is executed. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | new_filter: determine extra_args from filter typeGravatar Ferry Huberts2011-03-26-7/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the number of extra arguments is linked hard to the type of the filter. This is also logical since it would be confusing to have a different number of arguments for the same type of filter depending on the context under which the filter is run (unless ofcourse one the parameters would make the context clear, which is currently not the case). Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2011-05-24-29/+61
|\ \ \ | | |/ | |/|
| * | fix virtual-root if script-name is ""Gravatar Mark Lodato2011-05-24-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In d0cb841 (Avoid trailing slash in virtual-root), virtual-root was set from script-name using trim_end(). However, if script-name was the empty string (""), which happens when cgit is used to serve the root path on a domain (/), trim_end() returns NULL and cgit acts like virtual-root is not available. Now, set virtual-root to "" in this case, which fixes this bug. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-repolist.c: do not return random/stale data from read_agefileGravatar Lars Hjemli2011-05-24-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When git/date.c:parse_date() cannot parse its input it returns -1. But read_agefile() checks if the result is different from zero, essentialy returning random data from the date buffer when parsing fails. This patch fixes the issue by verifying that the result from parse_date() is positive. Noticed-by: Julius Plenz <plenz@cis.fu-berlin.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Avoid null pointer dereference in cgit_print_diff().Gravatar Lukas Fleischer2011-05-24-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling cgit_print_diff() with a bad new_rev and a NULL old_rev, checking for new_rev's parent commit will result in a null pointer dereference. Returning on an invalid commit before dereferencing fixes this. Spotted with clang-analyzer. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Avoid null pointer dereference in reencode().Gravatar Lukas Fleischer2011-05-24-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Returning "*txt" if "txt" is a null pointer is a bad thing. Spotted with clang-analyzer. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Fix memory leak in http_parse_querystring().Gravatar Lukas Fleischer2011-05-24-2/+3
| | | | | | | | | | | | | | | Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Remove unused variable from cgit_diff_tree().Gravatar Lukas Fleischer2011-05-24-3/+2
| | | | | | | | | | | | | | | | | | | | | Seen with "-Wunused-but-set-variable". Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | shared.c: do not modify const memoryGravatar Lars Hjemli2011-05-24-11/+3
| | | | | | | | | | | | | | | Noticed-by: zhongjj <zhongjj@lemote.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | tests: add tests for links with space in path and/or argsGravatar Lars Hjemli2011-05-24-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | These tests tries to detect bad links in various pages. On the log page, there currently exists links which are not properly escaped due to the use of cgit_fileurl() when building the link. For now, this bug is simply tagged as such. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | tests/setup.sh: add support for known bugsGravatar Lars Hjemli2011-05-24-1/+13
| | | | | | | | | | | | | | | | | | | | | This patch makes it possible to add tests for known bugs without aborting the testrun. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Fix escaping of paths with spacesGravatar Jonathon Mah2011-05-24-4/+6
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'dm/disable-clone'Gravatar Lars Hjemli2011-05-15-23/+40
|\ \ \
| * | | Return 404 on command not foundGravatar Dan McGee2011-02-19-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were returning 200 before. Even 404 is questionable in all cases, but 200 was totally wrong. Also match the case of all of the "Not found" status messsages. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Allow disabling of HTTP clone URLsGravatar Dan McGee2011-02-19-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If advertising other URLs to your users, you may not want to make this available through cgit (e.g. if you have the smart HTTP transport set up elsewhere). Allow disabling the three magic commands that simulate the git server, but default it to enabled. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Add is_clone flag to available commandsGravatar Dan McGee2011-02-19-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to make these operations configurable via a config option. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2011-03-26-11/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Add advice about scan-path in cgitrc.5.txtGravatar Julius Plenz2011-03-26-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | fix two encoding bugsGravatar Julius Plenz2011-03-26-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reencode() takes three arguments in the order (txt, from, to), opposed to reencode_string, which will, like iconv, handle the arguments with from and to swapped. Fix that (this makes reencode more intuitive). If src and dst encoding are equivalent, don't do any encoding. If no special encoding parameter is found within the commit, assume UTF-8 and explicitly convert to PAGE_ENCODING. The change to reencode() mentioned above avoids re-encoding a UTF-8 string to UTF-8, for example. Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | make enable-log-linecount independent of -filecountGravatar Julius Plenz2011-03-26-15/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | You should be able to independently switch file and line count on and off. This patch makes the code work like the documentation suggests: no dependency for line counts to be displayed only when file counts are. Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | new_filter: correctly initialise all arguments for a new filterGravatar Ferry Huberts2011-03-26-2/+4
| | | | | | | | | | | | | | | Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | source_filter: fix a memory leakGravatar Ferry Huberts2011-03-26-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | cgitrc.5: tar.xz is a supported snapshot formatGravatar Lars Hjemli2011-03-26-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | When tar.xz support was added in 0642435fed (2009-12-08: Add .tar.xz-snapshot support), cgitrc.5 was not updated to match. This patch fixes the issue. Signed-off-by: Lars Hjemli <hjemli@gmail.com>