"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/engine/http/request.cpp" between
FileZilla_3.48.0_src.tar.bz2 and FileZilla_3.48.1_src.tar.bz2

About: FileZilla is a fast and feature-rich cross-platform FTP, FTPS and SFTP client with an intuitive graphical user interface.

request.cpp  (FileZilla_3.48.0_src.tar.bz2):request.cpp  (FileZilla_3.48.1_src.tar.bz2)
skipping to change at line 148 skipping to change at line 148
opState |= request_send; opState |= request_send;
res = FZ_REPLY_CONTINUE; res = FZ_REPLY_CONTINUE;
} }
return res; return res;
} }
if (opState & request_send) { if (opState & request_send) {
if (send_pos_ >= requests_.size()) { if (send_pos_ >= requests_.size()) {
opState &= ~request_send; opState &= ~request_send;
} }
else if (!requests_[send_pos_]) {
log(logmsg::debug_warning, L"Null request in request_send
state.");
return FZ_REPLY_INTERNALERROR;
}
else { else {
auto & req = requests_[send_pos_]->request(); auto & req = requests_[send_pos_]->request();
if (!(req.flags_ & HttpRequest::flag_sent_header)) { if (!(req.flags_ & HttpRequest::flag_sent_header)) {
if (req.body_) { if (req.body_) {
req.set_content_length(req.body_->size()) ; req.set_content_length(req.body_->size()) ;
} }
else { else {
if (req.verb_ == "GET" || req.verb_ == "H EAD" || req.verb_ == "OPTIONS") { if (req.verb_ == "GET" || req.verb_ == "H EAD" || req.verb_ == "OPTIONS") {
req.headers_.erase("Content-Lengt h"); req.headers_.erase("Content-Lengt h");
} }
skipping to change at line 637 skipping to change at line 641
} }
read_state_.keep_alive_ = response.keep_alive() && request.keep_alive(); read_state_.keep_alive_ = response.keep_alive() && request.keep_alive();
int res = FZ_REPLY_CONTINUE; int res = FZ_REPLY_CONTINUE;
if (response.on_header_) { if (response.on_header_) {
res = response.on_header_(srr); res = response.on_header_(srr);
if (res != FZ_REPLY_CONTINUE) { if (res != FZ_REPLY_CONTINUE) {
if (res == FZ_REPLY_OK) { if (res == FZ_REPLY_OK) {
// Clear the pointer, we no longer need the reque if (!request.body_ || request.flags_ & HttpReques
st to finish, all needed information is in read_state_ t::flag_sent_body) {
srr.reset(); // Clear the pointer, we no longer need t
he request to finish, all needed information is in read_state_
srr.reset();
}
res = FZ_REPLY_CONTINUE; res = FZ_REPLY_CONTINUE;
} }
else { else {
response.flags_ |= HttpResponse::flag_ignore_body ; response.flags_ |= HttpResponse::flag_ignore_body ;
} }
} }
} }
if (res == FZ_REPLY_CONTINUE) { if (res == FZ_REPLY_CONTINUE) {
if (!read_state_.responseContentLength_) { if (!read_state_.responseContentLength_) {
 End of changes. 2 change blocks. 
3 lines changed or deleted 11 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)