Merge branch 'asf/master' into quic-latest

masaori335 · masaori335 · commit 0843eba371c0 · 2019-03-07T12:38:26.000+09:00
* asf/master:
  fix crash in CacheVC::openReadFromWriter
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
@@ -2035,8 +2035,7 @@ HTTPInfo::marshal(char *buf, int len)
     buf += m_alt->m_frag_offset_count * sizeof(FragOffset);
     used += m_alt->m_frag_offset_count * sizeof(FragOffset);
   } else {
-    // the data stored in intergral buffer
-    m_alt->m_frag_offsets = nullptr;
+    marshal_alt->m_frag_offsets = nullptr;
   }
 
   // The m_{request,response}_hdr->m_heap pointers are converted

Original file line number	Diff line number	Diff line change
`@@ -2035,8 +2035,7 @@ HTTPInfo::marshal(char *buf, int len)`
`2035`	`2035`	`buf += m_alt->m_frag_offset_count * sizeof(FragOffset);`
`2036`	`2036`	`used += m_alt->m_frag_offset_count * sizeof(FragOffset);`
`2037`	`2037`	`} else {`
`2038`		`- // the data stored in intergral buffer`
`2039`		`- m_alt->m_frag_offsets = nullptr;`
	`2038`	`+ marshal_alt->m_frag_offsets = nullptr;`
`2040`	`2039`	`}`
`2041`	`2040`
`2042`	`2041`	`// The m_{request,response}_hdr->m_heap pointers are converted`