add remaining URI_PATH chars per RFC 2396

remove '-' from URI_PORT


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@549 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 4 insertions, 2 deletions

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 35ca7484..468e4c22 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -182,11 +182,13 @@ struct timeval tv;
 
 #define server_port_check(use_ssl) (use_ssl ? HTTPS_PORT : HTTP_PORT)
 
+/* per RFC 2396 */
+ 
 #define HDR_LOCATION "%*[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]: "
 #define URI_HTTP "%[HTPShtps]://"
 #define URI_HOST "%[-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
-#define URI_PORT ":%[-0123456789]"
-#define URI_PATH "%[-_=@,?&#;/.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
+#define URI_PORT ":%[0123456789]"
+#define URI_PATH "%[-_.!~*'();/?:@&=+$,%#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
 
 enum {
         MAX_IPV4_HOSTLENGTH = 255,