--- parser3/src/targets/cgi/parser3.C 2009/08/08 13:30:21 1.251 +++ parser3/src/targets/cgi/parser3.C 2009/09/03 11:08:54 1.254 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_PARSER3_C="$Date: 2009/08/08 13:30:21 $"; +static const char * const IDENT_PARSER3_C="$Date: 2009/09/03 11:08:54 $"; #include "pa_config_includes.h" @@ -165,11 +165,9 @@ static void die_or_abort(const char* fmt // prepare header // let's be honest, that's bad we couldn't produce valid output - SAPI::add_header_attribute(SAPI_info, "status", "500"); + SAPI::add_header_attribute(SAPI_info, HTTP_STATUS, "500"); SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE, "text/plain"); - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length); - SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH, format(content_length, "%u")); // send header SAPI::send_header(SAPI_info); @@ -239,7 +237,7 @@ size_t SAPI::read_post(SAPI_Info& , char void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) { if( cgi && (!request || !request->console.was_used()) ) - printf("%s: %s\n", dont_store_key, dont_store_value); + printf("%s: %s\n", capitalize(dont_store_key), dont_store_value); } /// @todo intelligent cache-control @@ -598,7 +596,7 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright(c) 2001-2008 ArtLebedev Group (http://www.artlebedev.com)\n" + "Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -765,9 +763,7 @@ int main(int argc, char *argv[]) { // prepare header SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE, "text/plain"); - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); - SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH, format(content_length, "%u")); // send header SAPI::send_header(SAPI_info);