Merge branch '2.1' into 2.2

2018-02-02 15:31:18 +02:00
parent d7d2d3349d facb8d60f7
commit e1f1d8e58a
15 changed files with 597 additions and 11 deletions
--- a/server/modules/routing/avrorouter/avro_schema.c
+++ b/server/modules/routing/avrorouter/avro_schema.c
@ -1251,7 +1251,7 @@ static void skip_token(const char** saved)
 {
    const char* ptr = *saved;

-    while (*ptr && !isspace(*ptr))
+    while (*ptr && !isspace(*ptr) && *ptr != '(' && *ptr != '.')
    {
        ptr++;
    }