bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 10:35:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct: do not log 98/99 as an error

Browse Source
This commit is contained in:
z3APA3A 2019-01-20 17:52:00 +03:00
parent eed6e2962e
commit 5ee553e9a9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proxy.c
View File

@ -887,7 +887,6 @@ for(;;){
if(res != 99) { if(res != 99) {
RETURN(res); RETURN(res);
} }
res = 0;
} }
contentlength64 = 0; contentlength64 = 0;
inbuf = 0; inbuf = 0;
@ -1052,7 +1051,6 @@ for(;;){
if((res = mapsocket(param, conf.timeouts[CONNECTION_S])) != 98){ if((res = mapsocket(param, conf.timeouts[CONNECTION_S])) != 98){
RETURN(res); RETURN(res);
} }
res = 0;
param->waitserver64 = 0; param->waitserver64 = 0;
} }
} while(param->chunked); } while(param->chunked);

4
src/sockmap.c
View File

@ -25,7 +25,7 @@ ssize_t splice(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_t le
#define SPLICE_F_GIFT 0x08 #define SPLICE_F_GIFT 0x08
#endif #endif
#define RETURN(xxx) { param->res = xxx; goto CLEANRET; } #define RETURN(xxx) { res = xxx; goto CLEANRET; }
#define MIN(a,b) ((a>b)?b:a) #define MIN(a,b) ((a>b)?b:a)
#define MAXSPLICE 65536 #define MAXSPLICE 65536
@ -292,7 +292,7 @@ CLEANRET:
if(pipesrv[0] >= 0) close(pipesrv[0]); if(pipesrv[0] >= 0) close(pipesrv[0]);
if(pipesrv[1] >= 0) close(pipesrv[1]); if(pipesrv[1] >= 0) close(pipesrv[1]);
return param->res; return res;
} }
#endif #endif