Author: wrowe Date: Sat Jan 1 16:08:46 2005 New Revision: 123861 URL: http://svn.apache.org/viewcvs?view=rev&rev=123861 Log:
Transpose some of our table arrays to _name, _index and _value naming conventions. Just making the code more consistant. Modified: httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h httpd/mod_aspdotnet/trunk/Apache.Web/http_header_arrays.h Modified: httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp?view=diff&rev=123861&p1=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp&r1=123860&p2=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp&r2=123861 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp Sat Jan 1 16:08:46 2005 @@ -36,11 +36,11 @@ : SimpleWorkerRequest(String::Empty, String::Empty, 0) { // Initialize empty placeholders - known_req_header_value = new String* [RequestHeaderMaximum]; + request_headers_value = new String* [RequestHeaderMaximum]; unk_req_header_name = new ArrayList(); unk_req_header_index = new ArrayList(); unk_req_header_value = new ArrayList(); - env_var = new ArrayList(); + env_name = new ArrayList(); env_value = new ArrayList(); serverName = NULL; remoteName = NULL; @@ -69,8 +69,8 @@ // rr->filename is utf-8 encoded for Apache 2.0/WinNT filename = new String(rr->filename ? rr->filename : "", 0, - rr->filename ? strlen(rr->filename) : 0, - utf8_encoding); + rr->filename ? strlen(rr->filename) : 0, + utf8_encoding); filename = filename->Replace(L'/', L'\\'); // Now deal with the client's request headers @@ -81,9 +81,9 @@ String* key(pair->key); String* val(pair->val); String* key_index(key->ToLower(nullCulture)); - int ent = Array::IndexOf(request_headers_s, key_index); + int ent = Array::IndexOf(request_headers_name_s, key_index); if (ent >= 0) { - known_req_header_value[ent] = val; + request_headers_value[ent] = val; } else { unk_req_header_name->Add(key); @@ -108,7 +108,7 @@ apr_table_entry_t __nogc* pair = (apr_table_entry_t *)(void*)(elt); String* var(pair->key); String* val(pair->val); - env_var->Add(var); + env_name->Add(var); env_value->Add(val); } } Modified: httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h?view=diff&rev=123861&p1=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h&r1=123860&p2=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h&r2=123861 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h Sat Jan 1 16:08:46 2005 @@ -38,16 +38,16 @@ public __gc class WorkerRequest : public SimpleWorkerRequest { private: - static const char __nogc *response_headers_c __nogc[] = { + static const char __nogc *response_headers_name_c __nogc[] = { response_headers_m("") }; - static const char __nogc *request_headers_c __nogc[] = { - request_headers_m("") - }; - static String* response_headers_s[] = { + // static const char __nogc *request_headers_name_c __nogc[] = { + // request_headers_m("") + // }; + static String* response_headers_name_s[] = { response_headers_m(L) }; - static String* request_headers_s[] = { + static String* request_headers_name_s[] = { request_headers_m(L) }; static String* response_headers_index_s[] = { @@ -72,11 +72,11 @@ unsigned char query_raw __gc[]; - String* known_req_header_value[]; + String* request_headers_value[]; ArrayList* unk_req_header_name; ArrayList* unk_req_header_index; ArrayList* unk_req_header_value; - ArrayList* env_var; + ArrayList* env_name; ArrayList* env_value; _gcA_gcA_gcString *unk_req_hdr_arr; @@ -98,24 +98,24 @@ public: static bool CodeValidate() { - if (response_headers_s->get_Length() != ResponseHeaderMaximum) + if (response_headers_name_s->get_Length() != ResponseHeaderMaximum) return false; if (response_headers_index_s->get_Length() != ResponseHeaderMaximum) return false; for (int i = 0; i < ResponseHeaderMaximum; ++i) { String *s = HttpWorkerRequest::GetKnownResponseHeaderName(i); - if (response_headers_s[i]->CompareTo(s) != 0) + if (response_headers_name_s[i]->CompareTo(s) != 0) return false; if (response_headers_index_s[i]->CompareTo(s->ToLower(nullCulture)) != 0) return false; } - if (request_headers_s->get_Length() != RequestHeaderMaximum) + if (request_headers_name_s->get_Length() != RequestHeaderMaximum) return false; if (request_headers_index_s->get_Length() != RequestHeaderMaximum) return false; for (int i = 0; i < RequestHeaderMaximum; ++i) { String *s = HttpWorkerRequest::GetKnownRequestHeaderName(i); - if (request_headers_s[i]->CompareTo(s) != 0) + if (request_headers_name_s[i]->CompareTo(s) != 0) return false; if (request_headers_index_s[i]->CompareTo(s->ToLower(nullCulture)) != 0) return false; @@ -285,13 +285,13 @@ { if (name->Equals(L"ALL_RAW")) { int size = 1; - for (int i = 0; i < env_var->get_Count(); ++i) { - size += static_cast<String*>(env_var->get_Item(i))->get_Length() + 1; + for (int i = 0; i < env_name->get_Count(); ++i) { + size += static_cast<String*>(env_name->get_Item(i))->get_Length() + 1; size += static_cast<String*>(env_value->get_Item(i))->get_Length() + 1; } StringBuilder *res = new StringBuilder(size); - for (int i = 0; i < env_var->get_Count(); ++i) { - res = res->Append(static_cast<String*>(env_var->get_Item(i))); + for (int i = 0; i < env_name->get_Count(); ++i) { + res = res->Append(static_cast<String*>(env_name->get_Item(i))); res = res->Append(L"="); res = res->Append(static_cast<String*>(env_value->get_Item(i))); res = res->Append(L"\0", 0, 1); @@ -302,7 +302,7 @@ #endif return res->ToString(); } - int ent = env_var->IndexOf(name); + int ent = env_name->IndexOf(name); if (ent >= 0) { #ifdef _DEBUG String *res = String::Concat(L"GetServerVariable: for ", name, L" returns ", @@ -365,12 +365,12 @@ if (index >= 0 && index < RequestHeaderMaximum) { #ifdef _DEBUG String *res = String::Concat(L"GetKnownRequestHeader: for ", - request_headers_s[index], + request_headers_name_s[index], L" returns ", - known_req_header_value[index]); + request_headers_value[index]); LogRequestError(res, APLOG_DEBUG, 0); #endif - return known_req_header_value[index]; + return request_headers_value[index]; } #ifdef _DEBUG String *res = String::Concat(L"GetKnownRequestHeader: for ", @@ -418,7 +418,7 @@ static String *GetKnownRequestHeaderName(int header) { if (header >= 0 && header < RequestHeaderMaximum) { - return request_headers_s[header]; + return request_headers_name_s[header]; } return NULL; } @@ -431,7 +431,7 @@ static String *GetKnownResponseHeaderName(int header) { if (header >= 0 && header < ResponseHeaderMaximum) { - return response_headers_s[header]; + return response_headers_name_s[header]; } return NULL; } @@ -528,7 +528,7 @@ if (index >= 0 && index < ResponseHeaderMaximum) { #ifdef _DEBUG String *res = String::Concat(L"SendKnownResponseHeader: ", - response_headers_s[index], + response_headers_name_s[index], L" as ", value); LogRequestError(res, APLOG_DEBUG, 0); #endif @@ -541,7 +541,7 @@ if (index == HeaderContentType) ap_set_content_type(rr, poolval); else - apr_table_setn(rr->headers_out, response_headers_c[index], poolval); + apr_table_setn(rr->headers_out, response_headers_name_c[index], poolval); } #ifdef _DEBUG else { Modified: httpd/mod_aspdotnet/trunk/Apache.Web/http_header_arrays.h Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/http_header_arrays.h?view=diff&rev=123861&p1=httpd/mod_aspdotnet/trunk/Apache.Web/http_header_arrays.h&r1=123860&p2=httpd/mod_aspdotnet/trunk/Apache.Web/http_header_arrays.h&r2=123861 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/http_header_arrays.h (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/http_header_arrays.h Sat Jan 1 16:08:46 2005 @@ -20,7 +20,7 @@ // #pragma once -#define common_headers_m(t) \ +#define common_headers_name_m(t) \ t##"Cache-Control", \ t##"Connection", \ t##"Date", \ @@ -43,7 +43,7 @@ t##"Last-Modified" #define response_headers_m(t) \ - common_headers_m(t), \ + common_headers_name_m(t), \ t##"Accept-Ranges", \ t##"Age", \ t##"ETag", \ @@ -56,7 +56,7 @@ t##"WWW-Authenticate" #define request_headers_m(t) \ - common_headers_m(t), \ + common_headers_name_m(t), \ t##"Accept", \ t##"Accept-Charset", \ t##"Accept-Encoding", \
