mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #37205 (Serving binary content/images fails with "comm with server aborted" FastCGI err)

Browse Source
This commit is contained in:
Dmitry Stogov 2006-04-26 11:08:10 +00:00
parent af11e1d592
commit bbda630ed9
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Apr 2006, PHP 5.1.3RC4
- Fixed bug #37205 (Serving binary content/images fails with "comm with server
aborted" FastCGI err). (Dmitry)
- Fixed bug #37192 (cc may complain about non-constant initializers in
hash_adler.c). (Mike)
- Fixed bug #37191 (chmod takes off sticky bit when safe_mode is On). (Tony)

28
sapi/cgi/fastcgi.c
View File

@ -617,8 +617,12 @@ static inline void fcgi_close(fcgi_request *req, int force, int destroy)
if (is_impersonate) {
RevertToSelf();
}
#else
#if 1
shutdown(req->fd, 2);
#else
close(req->fd);
#endif
#endif
req->fd = -1;
}
@ -814,16 +818,30 @@ int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int l
memcpy(req->out_pos, str + limit, len - limit);
req->out_pos += len - limit;
} else {
int pad = ((len + 7) & ~7) - len;
rest = pad ? 8 - pad : 0;
int pos = 0;
int pad;
close_packet(req);
while ((len - pos) > 0xffff) {
open_packet(req, type);
fcgi_make_header(req->out_hdr, type, req->id, 0xfff8);
req->out_hdr = NULL;
fcgi_flush(req, 0);
if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
req->keep = 0;
return -1;
}
pos += 0xfff8;
}
pad = (((len - pos) + 7) & ~7) - (len - pos);
rest = pad ? 8 - pad : 0;
open_packet(req, type);
fcgi_make_header(req->out_hdr, type, req->id, len - rest);
fcgi_make_header(req->out_hdr, type, req->id, (len - pos) - rest);
req->out_hdr = NULL;
fcgi_flush(req, 0);
if (safe_write(req, str, len - rest) != len - rest) {
if (safe_write(req, str + pos, (len - pos) - rest) != (len - pos) - rest) {
req->keep = 0;
return -1;
}