diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | CHANGELOG | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.tex | 2 | ||||
| -rw-r--r-- | src/c/static.c | 5 | ||||
| -rw-r--r-- | src/monoize.sml | 4 | ||||
| -rw-r--r-- | src/settings.sml | 2 |
7 files changed, 22 insertions, 4 deletions
@@ -34,6 +34,7 @@ demo/more/out/*.html demo/more/demo.* doc/*.html +doc/*.out *.sql *mlmon.out @@ -1,4 +1,14 @@ ======== +20150412 +======== + +- Several new infix operators for function composition, etc. +- Hexadecimal integer literals +- New HTML events: 'oncontextmenu', 'onmouseenter', and 'onmouseleave' +- New HTML attributes: 'download' +- Bug fixes and optimization improvements + +======== 20150214 ======== diff --git a/configure.ac b/configure.ac index 3dd849ee..3adbdef2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([urweb], [20150214]) +AC_INIT([urweb], [20150412]) WORKING_VERSION=1 AC_USE_SYSTEM_EXTENSIONS diff --git a/doc/manual.tex b/doc/manual.tex index ad23d638..1ff3f7aa 100644 --- a/doc/manual.tex +++ b/doc/manual.tex @@ -9,6 +9,8 @@ \newcommand{\rcut}{\; \texttt{-{}-} \;} \newcommand{\rcutM}{\; \texttt{-{}-{}-} \;} +\usepackage{hyperref} + \begin{document} \title{The Ur/Web Manual} diff --git a/src/c/static.c b/src/c/static.c index 8f35a2d4..c8fd5bc7 100644 --- a/src/c/static.c +++ b/src/c/static.c @@ -16,6 +16,10 @@ static void log_(void *data, const char *fmt, ...) { static uw_loggers loggers = {NULL, log_, log_}; +static char *get_header(void *data, const char *h) { + return NULL; +} + int main(int argc, char *argv[]) { uw_context ctx; failure_kind fk; @@ -27,6 +31,7 @@ int main(int argc, char *argv[]) { ctx = uw_init(0, &loggers); uw_set_app(ctx, &uw_application); + uw_set_headers(ctx, get_header, NULL); uw_initialize(ctx); while (1) { diff --git a/src/monoize.sml b/src/monoize.sml index d1513ea6..8c1a4e3c 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -4693,8 +4693,8 @@ fun monoize env file = (L'.EDml (str (foldl (fn ((x, _), s) => s ^ ", " ^ Settings.mangleSql x ^ " = NULL") - ("UPDATE uw_" - ^ tab + ("UPDATE " + ^ Settings.mangleSql tab ^ " SET " ^ Settings.mangleSql x ^ " = NULL") diff --git a/src/settings.sml b/src/settings.sml index e15988cd..fc55511d 100644 --- a/src/settings.sml +++ b/src/settings.sml @@ -880,7 +880,7 @@ fun setFilePath path = filePath := path fun addFile {Uri, LoadFromFilename} = let - val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename} + val path = OS.Path.concat (!filePath, LoadFromFilename) in case SM.find (!files, Uri) of SOME (path', _) => |