--- parser3/src/include/pa_common.h 2008/07/15 12:50:24 1.124 +++ parser3/src/include/pa_common.h 2009/09/03 11:08:28 1.136 @@ -1,26 +1,58 @@ /** @file Parser: commonly used functions. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_COMMON_H #define PA_COMMON_H -static const char * const IDENT_COMMON_H="$Date: 2008/07/15 12:50:24 $"; +static const char * const IDENT_COMMON_H="$Date: 2009/09/03 11:08:28 $"; #include "pa_string.h" #include "pa_hash.h" +class Request; + // defines -#define HTTP_USER_AGENT "USER-AGENT" -#define HTTP_CONTENT_TYPE "CONTENT-TYPE" -#define HTTP_CONTENT_TYPE_FORM_URLENCODED "application/x-www-form-urlencoded" -#define HTTP_CONTENT_TYPE_MULTIPART "multipart/form-data" +#define HTTP_USER_AGENT "user-agent" +#define HTTP_STATUS "status" +#define HTTP_CONTENT_LENGTH "content-length" + +#define HTTP_CONTENT_TYPE "content-type" +#define HTTP_CONTENT_TYPE_UPPER "CONTENT-TYPE" +#define HTTP_CONTENT_TYPE_FORM_URLENCODED "application/x-www-form-urlencoded" +#define HTTP_CONTENT_TYPE_MULTIPART_FORMDATA "multipart/form-data" +#define HTTP_CONTENT_TYPE_MULTIPART_RELATED "multipart/related" +#define HTTP_CONTENT_TYPE_MULTIPART_MIXED "multipart/mixed" + +#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-tncoding" + +#define CONTENT_DISPOSITION "content-disposition" +#define CONTENT_DISPOSITION_ATTACHMENT "attachment" +#define CONTENT_DISPOSITION_INLINE "inline" +#define CONTENT_DISPOSITION_FILENAME_NAME "filename" + +const String http_content_type(HTTP_CONTENT_TYPE); + +const String content_transfer_encoding_name(CONTENT_TRANSFER_ENCODING_NAME); + +const String content_disposition(CONTENT_DISPOSITION); +const String content_disposition_inline(CONTENT_DISPOSITION_INLINE); +const String content_disposition_attachment(CONTENT_DISPOSITION_ATTACHMENT); +const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME); + + +#define HASH_ORDER + +#ifdef HASH_ORDER +#undef PA_HASH_CLASS +#include "pa_hash.h" +#endif class Value; -typedef Hash HashStringValue; +typedef HASH_STRING HashStringValue; // replace system s*nprintf with our versions #undef vsnprintf @@ -62,13 +94,15 @@ inline long lseek( int handle, long offs #endif +const char* capitalize(const char* s); + /** under WIN32 "t" mode fixes DOS chars OK, can't say that about other systems/ line break styles */ void fix_line_breaks( - char *str, - size_t& length///< may change! used to speedup next actions - ); + char *str, + size_t& length///< may change! used to speedup next actions + ); int pa_lock_shared_blocking(int fd); int pa_lock_exclusive_blocking(int fd); @@ -78,10 +112,10 @@ int pa_unlock(int fd); void create_dir_for_file(const String& file_spec); typedef void (*File_read_action)( - struct stat& finfo, - int f, - const String& file_spec, const char* fname, bool as_text, - void *context); + struct stat& finfo, + int f, + const String& file_spec, const char* fname, bool as_text, + void *context); /** shared-lock specified file, @@ -94,19 +128,24 @@ bool file_read_action_under_lock(const S const char* action_name, File_read_action action, void *context, bool as_text=false, bool fail_on_read_problem=true); + /** read specified text file using if fail_on_read_problem is true[default] throws an exception WARNING: charset is used for http header case conversion, it's not a charset of input file! - - @returns true if read OK */ char *file_read_text(Request_charsets& charsets, - const String& file_spec, - bool fail_on_read_problem=true, - HashStringValue* options=0, - bool transcode_result=true); + const String& file_spec, + bool fail_on_read_problem=true, + HashStringValue* options=0, + bool transcode_result=true); + +char *file_load_text(Request& r, + const String& file_spec, + bool fail_on_read_problem=true, + HashStringValue* options=0, + bool transcode_result=true); struct File_read_result { bool success; @@ -119,15 +158,20 @@ struct File_read_result { if fail_on_read_problem is true[default] throws an exception WARNING: charset is used for http header case conversion, it's not a charset of input file! - - @returns true if read OK */ -File_read_result file_read(Request_charsets& charsets, - const String& file_spec, - bool as_text, - HashStringValue* options=0, - bool fail_on_read_problem=true, - char* buf=0, size_t offset=0, size_t size=0, bool transcode_text_result=true); +File_read_result file_read(Request_charsets& charsets, + const String& file_spec, + bool as_text, + HashStringValue* options=0, + bool fail_on_read_problem=true, + char* buf=0, size_t offset=0, size_t size=0, bool transcode_text_result=true); + +File_read_result file_load(Request& r, + const String& file_spec, + bool as_text, + HashStringValue* options=0, + bool fail_on_read_problem=true, + char* buf=0, size_t offset=0, size_t size=0, bool transcode_text_result=true); typedef void (*File_write_action)(int f, void *context); @@ -178,11 +222,11 @@ const String* file_exist(const String& p bool file_executable(const String& file_spec); bool file_stat(const String& file_spec, - size_t& rsize, - time_t& ratime, - time_t& rmtime, - time_t& rctime, - bool fail_on_read_problem=true); + size_t& rsize, + time_t& ratime, + time_t& rmtime, + time_t& rctime, + bool fail_on_read_problem=true); /** scans for @a delim[default \n] in @a *row_ref, @@ -214,7 +258,6 @@ bool StrStartFromNC(const char* str, con size_t strpos(const char *str, const char *substr); Charset* detect_charset(const char* content_type); -Charset* detect_charset(Charset& source_charset, const String& content_type); #define SECS_PER_DAY (60*60*24) int getMonthDays(int year, int month); @@ -232,10 +275,10 @@ struct File_base64_action_info { }; char* pa_base64_encode(const String& file_spec); static void file_base64_file_action( - struct stat& finfo, - int f, - const String&, const char* /*fname*/, bool, - void *context); + struct stat& finfo, + int f, + const String&, const char* /*fname*/, bool, + void *context); #define FILE_BUFFER_SIZE 4096 static unsigned long crc32Table[256]; @@ -271,10 +314,10 @@ inline void CalcCrc32(const unsigned cha const unsigned long pa_crc32(const char *in, size_t in_size); const unsigned long pa_crc32(const String& file_spec); static void file_crc32_file_action( - struct stat& finfo, - int f, - const String&, const char* /*fname*/, bool, - void *context); + struct stat& finfo, + int f, + const String&, const char* /*fname*/, bool, + void *context); static const char* hex_string(unsigned char* bytes, size_t size, bool upcase) { char *bytes_hex=new(PointerFreeGC) char [size*2/*byte->hh*/+1/*for zero-teminator*/]; @@ -285,8 +328,8 @@ static const char* hex_string(unsigned c const char *hex=upcase?"0123456789ABCDEF":"0123456789abcdef"; for(; srcput(key, value); }