[Nagiosplug-checkins] CVS: nagiosplug/plugins check_http.c,1.34,1.35

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv23285

Modified Files:
	check_http.c 
Log Message:
add remaining URI_PATH chars per RFC 2396
remove '-' from URI_PORT


Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** check_http.c	11 Jun 2003 10:41:46 -0000	1.34
--- check_http.c	21 Jun 2003 05:23:03 -0000	1.35
***************
*** 183,191 ****
  #define server_port_check(use_ssl) (use_ssl ? HTTPS_PORT : HTTP_PORT)
  
  #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]"
  
  enum {
--- 183,193 ----
  #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]"
  
  enum {