hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oeps2

Browse source
This commit is contained in:
Thulinma 2011-03-21 00:46:01 +01:00
parent 22b49b27e4
commit 3be983213d
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Connector_HTTP/main.cpp
View file

@ -298,18 +298,7 @@ int mainHandler(int CONN_fd){
if (FlashBuf != ""){ if (FlashBuf != ""){
Flash_FragBuffer.push(FlashBuf); Flash_FragBuffer.push(FlashBuf);
#if DEBUG >= 4 #if DEBUG >= 4
<<<<<<< HEAD
fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size()); fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size());
=======
time_t rawtime;
struct tm * timeinfo;
char timebuffer [80];
time ( &rawtime );
timeinfo = localtime ( &rawtime );
strftime (timebuffer,80,"%H:%M.%S.",timeinfo);
fprintf(stderr, "< %s >\t", timebuffer );
fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size());
>>>>>>> 7520f5799f3da3c1a89a28fd4d62358b0028d8d2
#endif #endif
} }
FlashBuf.clear(); FlashBuf.clear();