*** thttpd-2.22beta5cg2/libhttpd.c	Wed May  1 02:10:48 2002
--- thttpd-2.22beta5cg2a/libhttpd.c	Wed May  1 02:30:37 2002
***************
*** 171,177 ****
  static int sockaddr_check( httpd_sockaddr* saP );
  static size_t sockaddr_len( httpd_sockaddr* saP );
  static int my_snprintf( char* str, size_t size, const char* format, ... );
! static long long atoll( const char* str );
  
  
  static int reap_time;
--- 171,177 ----
  static int sockaddr_check( httpd_sockaddr* saP );
  static size_t sockaddr_len( httpd_sockaddr* saP );
  static int my_snprintf( char* str, size_t size, const char* format, ... );
! static long long myatoll( const char* str );
  
  
  static int reap_time;
***************
*** 2168,2176 ****
  			    {
  			    *cp_dash = '\0';
  			    hc->got_range = 1;
! 			    hc->init_byte_loc = atoll( cp + 1 );
  			    if ( isdigit( (int) cp_dash[1] ) )
! 				hc->end_byte_loc = atoll( cp_dash + 1 );
  			    }
  			}
  		    }
--- 2168,2176 ----
  			    {
  			    *cp_dash = '\0';
  			    hc->got_range = 1;
! 			    hc->init_byte_loc = myatoll( cp + 1 );
  			    if ( isdigit( (int) cp_dash[1] ) )
! 				hc->end_byte_loc = myatoll( cp_dash + 1 );
  			    }
  			}
  		    }
***************
*** 2345,2357 ****
  #endif /* TILDE_MAP_2 */
  	else
  	    {
! 	    syslog(
! 		LOG_NOTICE, "%.80s URL \"%.80s\" goes outside the web tree",
! 		httpd_ntoa( &hc->client_addr ), hc->encodedurl );
! 	    httpd_send_err(
! 		hc, 403, err403title, "",
! 		ERROR_FORM( err403form, "The requested URL '%.80s' resolves to a file outside the permitted web server directory tree.\n" ),
! 		hc->encodedurl );
  	    return -1;
  	    }
  	}
--- 2345,2362 ----
  #endif /* TILDE_MAP_2 */
  	else
  	    {
! 	    if (hc->hs->no_symlink) {
! 	        httpd_send_err( hc, 404, err404title, "", err404form, hc->encodedurl );
! 		}
! 	    else {
! 	    	syslog(
! 			LOG_NOTICE, "%.80s URL \"%.80s\" goes outside the web tree",
! 			httpd_ntoa( &hc->client_addr ), hc->encodedurl );
! 	    	httpd_send_err(
! 			hc, 403, err403title, "",
! 			ERROR_FORM( err403form, "The requested URL '%.80s' resolves to a file outside the permitted web server directory tree.\n" ),
! 			hc->encodedurl );
! 		}
  	    return -1;
  	    }
  	}
***************
*** 4114,4120 ****
  
  
  static long long
! atoll( const char* str )
      {
      long long value;
      long long sign;
--- 4119,4125 ----
  
  
  static long long
! myatoll( const char* str )
      {
      long long value;
      long long sign;