Diff: core/net/httpd/NyLPC_cHttpdConnection.c

Revision:

48:00d211aac2ec

Parent:

43:a182f2b5ff41

Child:

57:bc4330dfa62f

diff -r d27b9b2dcac6 -r 00d211aac2ec core/net/httpd/NyLPC_cHttpdConnection.c
--- a/core/net/httpd/NyLPC_cHttpdConnection.c	Sun Jul 28 01:07:37 2013 +0000
+++ b/core/net/httpd/NyLPC_cHttpdConnection.c	Wed Aug 07 13:53:02 2013 +0000
@@ -42,7 +42,7 @@
         NyLPC_OnErrorGoto(Error_Status);
     }
     //ステータスラインの記述
-    if(!NyLPC_iHttpPtrStream_write(&(i_inst->_in_stream),"HTTP/1.1 100 Continue\r\n\r\n",25)){
+    if(!NyLPC_iHttpPtrStream_write(&(i_inst->_in_stream.super),"HTTP/1.1 100 Continue\r\n\r\n",25)){
         NyLPC_OnErrorGoto(Error);
     }
     return NyLPC_TBool_TRUE;
@@ -69,7 +69,7 @@
         NyLPC_OnErrorGoto(Error_Status);
     }
     //ヘッダ送信
-    if(!NyLPC_cHttpHeaderWriter_initialize(h,&(i_inst->_in_stream),NULL)){
+    if(!NyLPC_cHttpHeaderWriter_initialize(h,&(i_inst->_in_stream.super),NULL)){
         NyLPC_OnErrorGoto(ERROR_SEND);
     }
     //Headerの転送モードセット
@@ -166,7 +166,7 @@
 static void sendErrorResponse(NyLPC_TcHttpdConnection_t* i_inst,NyLPC_TInt16 i_status)
 {
     NyLPC_TcHttpHeaderWriter_t* h=&(i_inst->_head_writer);
-    if(NyLPC_cHttpHeaderWriter_initialize(h,&i_inst->_in_stream,NULL)){
+    if(NyLPC_cHttpHeaderWriter_initialize(h,&i_inst->_in_stream.super,NULL)){
         //ヘッダを送信
         NyLPC_cHttpHeaderWriter_setConnectionClose(h,NyLPC_TBool_TRUE);
         NyLPC_cHttpHeaderWriter_writeHeader(h,i_status);
@@ -281,7 +281,7 @@
     NyLPC_Assert(i_inst->_req_status==NyLPC_cHttpdConnection_ReqStatus_PREFETCH);
 
     //Prefetchを実行
-    if(!NyLPC_cHttpRequestPrefixParser_parse(&i_inst->_pparser,&i_inst->_in_stream)){
+    if(!NyLPC_cHttpRequestPrefixParser_parse(&i_inst->_pparser,&i_inst->_in_stream.super)){
         //400エラー
         sendErrorResponse(i_inst,400);
         NyLPC_OnErrorGoto(Error_Prefetch);
@@ -313,7 +313,7 @@
         NyLPC_cHttpNullRequestHeaderParser_parseChar(&parser,"GET ",4);//決め打ち
         NyLPC_cHttpNullRequestHeaderParser_parseChar(&parser,i_inst->_pparser._url,strlen(i_inst->_pparser._url));
         //後続をストリームから取り込む
-        if(NyLPC_cHttpNullRequestHeaderParser_parseStream(&parser,&(i_inst->_in_stream))){
+        if(NyLPC_cHttpNullRequestHeaderParser_parseStream(&parser,&(i_inst->_in_stream.super))){
             if(NyLPC_cHttpNullRequestHeaderParser_parseFinish(&parser)){
                 NyLPC_cHttpNullRequestHeaderParser_finalize(&parser);
                 //OK:403