--- parser3/src/include/pa_common.h 2015/06/03 00:13:19 1.159 +++ parser3/src/include/pa_common.h 2016/07/21 18:30:10 1.163 @@ -1,14 +1,14 @@ /** @file Parser: commonly used functions. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_COMMON_H #define PA_COMMON_H -#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.159 2015/06/03 00:13:19 moko Exp $" +#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.163 2016/07/21 18:30:10 moko Exp $" #include "pa_string.h" #include "pa_hash.h" @@ -16,8 +16,6 @@ class Request; // defines -#define HTTP_USER_AGENT "user-agent" - #define HTTP_STATUS "status" #define HTTP_STATUS_CAPITALIZED "Status" @@ -94,11 +92,7 @@ void create_dir_for_file(const String& f int pa_get_valid_file_options_count(HashStringValue& options); -typedef void (*File_read_action)( - struct stat& finfo, - int f, - const String& file_spec, const char* fname, bool as_text, - void *context); +typedef void (*File_read_action)(struct stat& finfo, int f, const String& file_spec, void *context); /** shared-lock specified file, @@ -279,28 +273,16 @@ const unsigned long pa_crc32(const Strin */ // some stuff for use with .for_each -static void copy_all_overwrite_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - HashStringValue* dest) { +static void copy_all_overwrite_to(HashStringValue::key_type key, HashStringValue::value_type value, HashStringValue* dest) { dest->put(key, value); } -static void remove_key_from( - HashStringValue::key_type key, - HashStringValue::value_type /*value*/, - HashStringValue* dest) { +static void remove_key_from(HashStringValue::key_type key, HashStringValue::value_type /*value*/, HashStringValue* dest) { dest->remove(key); } Charset* detect_charset(const char* content_type); -#define SECS_PER_DAY (60*60*24) - -int getMonthDays(int year, int month); - -String::C date_gmt_string(tm* tms); - // globals extern const String file_status_name;