trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1171658 - in /trafficserver/traffic/trunk/proxy/hdrs: HTTP.cc HdrTest.cc
Date Fri, 16 Sep 2011 16:47:32 GMT
Author: zwoop
Date: Fri Sep 16 16:47:31 2011
New Revision: 1171658

URL: http://svn.apache.org/viewvc?rev=1171658&view=rev
Log:
TS-950 Make the HTTP header regressions work on 32-bit, inefficient, but works

Modified:
    trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc
    trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc

Modified: trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc?rev=1171658&r1=1171657&r2=1171658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc Fri Sep 16 16:47:31 2011
@@ -162,7 +162,7 @@ is_digit(char c)
  ***********************************************************************/
 
 void
-http_hdr_adjust(HTTPHdrImpl * hdrp, int32_t offset, int32_t length, int32_t delta)
+http_hdr_adjust(HTTPHdrImpl *hdrp, int32_t offset, int32_t length, int32_t delta)
 {
   NOWARN_UNUSED(hdrp);
   NOWARN_UNUSED(offset);
@@ -294,7 +294,7 @@ http_init()
   -------------------------------------------------------------------------*/
 
 HTTPHdrImpl *
-http_hdr_create(HdrHeap * heap, HTTPType polarity)
+http_hdr_create(HdrHeap *heap, HTTPType polarity)
 {
   HTTPHdrImpl *hh;
 
@@ -307,7 +307,7 @@ http_hdr_create(HdrHeap * heap, HTTPType
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_init(HdrHeap * heap, HTTPHdrImpl * hh, HTTPType polarity)
+http_hdr_init(HdrHeap *heap, HTTPHdrImpl *hh, HTTPType polarity)
 {
   memset(&(hh->u), 0, sizeof(hh->u));
   hh->m_polarity = polarity;
@@ -323,7 +323,7 @@ http_hdr_init(HdrHeap * heap, HTTPHdrImp
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_copy_onto(HTTPHdrImpl * s_hh, HdrHeap * s_heap, HTTPHdrImpl * d_hh, HdrHeap * d_heap,
bool inherit_strs)
+http_hdr_copy_onto(HTTPHdrImpl *s_hh, HdrHeap *s_heap, HTTPHdrImpl *d_hh, HdrHeap *d_heap,
bool inherit_strs)
 {
   MIMEHdrImpl *s_mh, *d_mh;
   URLImpl *s_url, *d_url;
@@ -363,7 +363,7 @@ http_hdr_copy_onto(HTTPHdrImpl * s_hh, H
   -------------------------------------------------------------------------*/
 
 HTTPHdrImpl *
-http_hdr_clone(HTTPHdrImpl * s_hh, HdrHeap * s_heap, HdrHeap * d_heap)
+http_hdr_clone(HTTPHdrImpl *s_hh, HdrHeap *s_heap, HdrHeap *d_heap)
 {
   HTTPHdrImpl *d_hh;
 
@@ -418,7 +418,7 @@ http_version_print(int32_t version, char
   -------------------------------------------------------------------------*/
 
 int
-http_hdr_print(HdrHeap * heap, HTTPHdrImpl * hdr, char *buf, int bufsize, int *bufindex,
int *dumpoffset)
+http_hdr_print(HdrHeap *heap, HTTPHdrImpl *hdr, char *buf, int bufsize, int *bufindex, int
*dumpoffset)
 {
 #define TRY(x)  if (!x) return 0
 
@@ -559,7 +559,7 @@ http_hdr_print(HdrHeap * heap, HTTPHdrIm
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_describe(HdrHeapObjImpl * raw, bool recurse)
+http_hdr_describe(HdrHeapObjImpl *raw, bool recurse)
 {
   HTTPHdrImpl *obj = (HTTPHdrImpl *) raw;
 
@@ -590,7 +590,7 @@ http_hdr_describe(HdrHeapObjImpl * raw, 
   -------------------------------------------------------------------------*/
 
 int
-http_hdr_length_get(HTTPHdrImpl * hdr)
+http_hdr_length_get(HTTPHdrImpl *hdr)
 {
   int length = 0;
 
@@ -641,7 +641,7 @@ http_hdr_length_get(HTTPHdrImpl * hdr)
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_type_set(HTTPHdrImpl * hh, HTTPType type)
+http_hdr_type_set(HTTPHdrImpl *hh, HTTPType type)
 {
   hh->m_polarity = type;
 }
@@ -650,7 +650,7 @@ http_hdr_type_set(HTTPHdrImpl * hh, HTTP
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_version_set(HTTPHdrImpl * hh, int32_t ver)
+http_hdr_version_set(HTTPHdrImpl *hh, int32_t ver)
 {
   hh->m_version = ver;
 }
@@ -659,7 +659,7 @@ http_hdr_version_set(HTTPHdrImpl * hh, i
   -------------------------------------------------------------------------*/
 
 const char *
-http_hdr_method_get(HTTPHdrImpl * hh, int *length)
+http_hdr_method_get(HTTPHdrImpl *hh, int *length)
 {
   const char *str;
 
@@ -680,8 +680,8 @@ http_hdr_method_get(HTTPHdrImpl * hh, in
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_method_set(HdrHeap * heap,
-                    HTTPHdrImpl * hh, const char *method, int16_t method_wks_idx, int method_length,
bool must_copy)
+http_hdr_method_set(HdrHeap *heap, HTTPHdrImpl *hh, const char *method, int16_t method_wks_idx,
int method_length,
+                    bool must_copy)
 {
   ink_debug_assert(hh->m_polarity == HTTP_TYPE_REQUEST);
 
@@ -693,7 +693,7 @@ http_hdr_method_set(HdrHeap * heap,
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_url_set(HdrHeap * heap, HTTPHdrImpl * hh, URLImpl * url)
+http_hdr_url_set(HdrHeap *heap, HTTPHdrImpl *hh, URLImpl *url)
 {
   ink_debug_assert(hh->m_polarity == HTTP_TYPE_REQUEST);
   if (hh->u.req.m_url_impl != url) {
@@ -709,7 +709,7 @@ http_hdr_url_set(HdrHeap * heap, HTTPHdr
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_status_set(HTTPHdrImpl * hh, HTTPStatus status)
+http_hdr_status_set(HTTPHdrImpl *hh, HTTPStatus status)
 {
   ink_debug_assert(hh->m_polarity == HTTP_TYPE_RESPONSE);
   hh->u.resp.m_status = status;
@@ -719,7 +719,7 @@ http_hdr_status_set(HTTPHdrImpl * hh, HT
   -------------------------------------------------------------------------*/
 
 const char *
-http_hdr_reason_get(HTTPHdrImpl * hh, int *length)
+http_hdr_reason_get(HTTPHdrImpl *hh, int *length)
 {
   ink_debug_assert(hh->m_polarity == HTTP_TYPE_RESPONSE);
   *length = hh->u.resp.m_len_reason;
@@ -730,7 +730,7 @@ http_hdr_reason_get(HTTPHdrImpl * hh, in
   -------------------------------------------------------------------------*/
 
 void
-http_hdr_reason_set(HdrHeap * heap, HTTPHdrImpl * hh, const char *value, int length, bool
must_copy)
+http_hdr_reason_set(HdrHeap *heap, HTTPHdrImpl *hh, const char *value, int length, bool must_copy)
 {
   ink_debug_assert(hh->m_polarity == HTTP_TYPE_RESPONSE);
   mime_str_u16_set(heap, value, length, &(hh->u.resp.m_ptr_reason), &(hh->u.resp.m_len_reason),
must_copy);
@@ -832,7 +832,7 @@ http_hdr_reason_lookup(HTTPStatus status
   -------------------------------------------------------------------------*/
 
 void
-_http_parser_init(HTTPParser * parser)
+_http_parser_init(HTTPParser *parser)
 {
   parser->m_parsing_http = true;
 }
@@ -843,14 +843,14 @@ _http_parser_init(HTTPParser * parser)
 //////////////////////////////////////////////////////
 
 void
-http_parser_init(HTTPParser * parser)
+http_parser_init(HTTPParser *parser)
 {
   _http_parser_init(parser);
   mime_parser_init(&parser->m_mime_parser);
 }
 
 void
-http_parser_clear(HTTPParser * parser)
+http_parser_clear(HTTPParser *parser)
 {
   _http_parser_init(parser);
   mime_parser_clear(&parser->m_mime_parser);
@@ -876,9 +876,8 @@ http_parser_clear(HTTPParser * parser)
 // NOTE: end is ONE CHARACTER PAST end of string!
 
 MIMEParseResult
-http_parser_parse_req(HTTPParser * parser,
-                      HdrHeap * heap,
-                      HTTPHdrImpl * hh, const char **start, const char *end, bool must_copy_strings,
bool eof)
+http_parser_parse_req(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const char **start,
const char *end,
+                      bool must_copy_strings, bool eof)
 {
   if (parser->m_parsing_http) {
     MIMEScanner *scanner = &parser->m_mime_parser.m_scanner;
@@ -1086,9 +1085,8 @@ http_parser_parse_req(HTTPParser * parse
   -------------------------------------------------------------------------*/
 
 MIMEParseResult
-http_parser_parse_resp(HTTPParser * parser,
-                       HdrHeap * heap,
-                       HTTPHdrImpl * hh, const char **start, const char *end, bool must_copy_strings,
bool eof)
+http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const char **start,
const char *end,
+                       bool must_copy_strings, bool eof)
 {
   if (parser->m_parsing_http) {
     MIMEScanner *scanner = &parser->m_mime_parser.m_scanner;
@@ -1320,7 +1318,7 @@ http_parse_version(const char *start, co
   -------------------------------------------------------------------------*/
 
 static char *
-http_str_store(Arena * arena, const char *str, int length)
+http_str_store(Arena *arena, const char *str, int length)
 {
   const char *wks;
   int idx = hdrtoken_tokenize(str, length, &wks);
@@ -1423,7 +1421,7 @@ http_parse_qvalue(const char *&buf, int 
   -------------------------------------------------------------------------*/
 
 HTTPValTE *
-http_parse_te(const char *buf, int len, Arena * arena)
+http_parse_te(const char *buf, int len, Arena *arena)
 {
   HTTPValTE *val;
   const char *s;
@@ -1545,14 +1543,11 @@ HTTPHdr::url_string_get(Arena* arena, in
  ***********************************************************************/
 
 int
-HTTPHdr::unmarshal(char *buf, int len, RefCountObj * block_ref)
+HTTPHdr::unmarshal(char *buf, int len, RefCountObj *block_ref)
 {
-  m_heap = (HdrHeap *) buf;
+  m_heap = (HdrHeap *)buf;
 
-  int res = m_heap->unmarshal(len,
-                              HDR_HEAP_OBJ_HTTP_HEADER,
-                              (HdrHeapObjImpl **) & m_http,
-                              block_ref);
+  int res = m_heap->unmarshal(len, HDR_HEAP_OBJ_HTTP_HEADER, (HdrHeapObjImpl **) &
m_http, block_ref);
 
   if (res > 0) {
     m_mime = m_http->m_fields_impl;
@@ -1564,7 +1559,7 @@ HTTPHdr::unmarshal(char *buf, int len, R
 }
 
 int
-HTTPHdrImpl::marshal(MarshalXlate * ptr_xlate, int num_ptr, MarshalXlate * str_xlate, int
num_str)
+HTTPHdrImpl::marshal(MarshalXlate *ptr_xlate, int num_ptr, MarshalXlate *str_xlate, int num_str)
 {
 
   if (m_polarity == HTTP_TYPE_REQUEST) {
@@ -1600,7 +1595,7 @@ HTTPHdrImpl::unmarshal(intptr_t offset)
 
 
 void
-HTTPHdrImpl::move_strings(HdrStrHeap * new_heap)
+HTTPHdrImpl::move_strings(HdrStrHeap *new_heap)
 {
   if (m_polarity == HTTP_TYPE_REQUEST) {
     HDR_MOVE_STR(u.req.m_ptr_method, u.req.m_len_method);
@@ -1612,7 +1607,7 @@ HTTPHdrImpl::move_strings(HdrStrHeap * n
 }
 
 void
-HTTPHdrImpl::check_strings(HeapCheck * heaps, int num_heaps)
+HTTPHdrImpl::check_strings(HeapCheck *heaps, int num_heaps)
 {
 
   if (m_polarity == HTTP_TYPE_REQUEST) {
@@ -1656,7 +1651,7 @@ HTTPCacheAlt::destroy()
 }
 
 void
-HTTPCacheAlt::copy(HTTPCacheAlt * to_copy)
+HTTPCacheAlt::copy(HTTPCacheAlt *to_copy)
 {
 
   m_magic = to_copy->m_magic;
@@ -1692,7 +1687,7 @@ HTTPInfo::create()
 }
 
 void
-HTTPInfo::copy(HTTPInfo * hi)
+HTTPInfo::copy(HTTPInfo *hi)
 {
 
   if (m_alt && m_alt->m_writeable) {
@@ -1777,7 +1772,7 @@ HTTPInfo::marshal(char *buf, int len)
 }
 
 int
-HTTPInfo::unmarshal(char *buf, int len, RefCountObj * block_ref)
+HTTPInfo::unmarshal(char *buf, int len, RefCountObj *block_ref)
 {
   HTTPCacheAlt *alt = (HTTPCacheAlt *) buf;
   int orig_len = len;
@@ -1899,7 +1894,7 @@ HTTPInfo::check_marshalled(char *buf, in
 //     to set up the reference
 //
 void
-HTTPInfo::set_buffer_reference(RefCountObj * block_ref)
+HTTPInfo::set_buffer_reference(RefCountObj *block_ref)
 {
   ink_assert(m_alt->m_magic == CACHE_ALT_MAGIC_ALIVE);
 

Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc?rev=1171658&r1=1171657&r2=1171658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc Fri Sep 16 16:47:31 2011
@@ -1074,7 +1074,7 @@ HdrTest::test_http_hdr_print_and_copy_au
   int cpy_bufsize = sizeof(cpy_buf);
   int cpy_bufindex, cpy_dumpoffset, cpy_ret;
 
-  char marshal_buf[2048];
+  char *marshal_buf = (char*)ats_malloc(2048);
   int marshal_bufsize = sizeof(cpy_buf);
 
     /*** (1) parse the request string into hdr ***/
@@ -1106,6 +1106,7 @@ HdrTest::test_http_hdr_print_and_copy_au
   marshal_hdr.unmarshal(marshal_buf, marshal_len, &ref);
   new_hdr.create(HTTP_TYPE_REQUEST);
   new_hdr.copy(&marshal_hdr);
+  ats_free(marshal_buf);
 
     /*** (3) print the request header and copy to buffers ***/
 



Mime
View raw message