diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-10 10:10:07 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-10 10:10:07 +0100 |
| commit | 13cc395f1a61f9cfaf62162e9f81ce895af16b4a (patch) | |
| tree | 587a79cccb0d8ded7da5e818d6306f7368b6892b | |
| parent | de12bf3757f25e61d40cae88f5ba10ee3a04db8f (diff) | |
| parent | 27dabfab5419cbf00f3b80683f31453db8bed1f9 (diff) | |
| download | vyos-1x-13cc395f1a61f9cfaf62162e9f81ce895af16b4a.tar.gz vyos-1x-13cc395f1a61f9cfaf62162e9f81ce895af16b4a.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
T1843: fix proxy URL handling when running through GCC preprocessor
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | interface-definitions/system-proxy.xml.in | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -18,7 +18,7 @@ obj = $(src:.xml.in=.xml) # -nostdinc Do not search the standard system directories for header files # -P Inhibit generation of linemarkers in the output from the # preprocessor - @$(CC) -ansi -x c -E -undef -nostdinc -P -I$(CURDIR)/interface-definitions -o $(BUILD_DIR)/$@ -c $< + @$(CC) -x c-header -E -undef -nostdinc -P -I$(CURDIR)/interface-definitions -o $(BUILD_DIR)/$@ -c $< $(BUILD_DIR): install -d -m 0755 $(BUILD_DIR)/interface-definitions diff --git a/interface-definitions/system-proxy.xml.in b/interface-definitions/system-proxy.xml.in index 4b21139a6..540fa97e3 100644 --- a/interface-definitions/system-proxy.xml.in +++ b/interface-definitions/system-proxy.xml.in @@ -11,7 +11,7 @@ <properties> <help>Proxy URL</help> <constraint> - <regex>http://[a-z0-9\.]+$</regex> + <regex>http:\/\/[a-z0-9\.]+$</regex> </constraint> </properties> </leafNode> @@ -27,7 +27,7 @@ <properties> <help>Proxy username</help> <constraint> - <regex>^[a-z0-9-_\.]{1,100}$</regex> + <regex>[a-z0-9-_\.]{1,100}$</regex> </constraint> </properties> </leafNode> |