merged changes from RC_1_0
This commit is contained in:
parent
bfb0c4fe80
commit
e1d0592a57
|
@ -35,6 +35,7 @@
|
||||||
|
|
||||||
1.0.3 release
|
1.0.3 release
|
||||||
|
|
||||||
|
* fix link order bug in makefile for python binding
|
||||||
* fix bug in interest calculation, causing premature disconnects
|
* fix bug in interest calculation, causing premature disconnects
|
||||||
* tweak flag_override_resume_data semantics to make more sense (breaks
|
* tweak flag_override_resume_data semantics to make more sense (breaks
|
||||||
backwards compatibility of edge-cases)
|
backwards compatibility of edge-cases)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
@LDFLAGS@ -L@top_builddir@/src/.libs
|
-L@top_builddir@/src/.libs @LDFLAGS@
|
||||||
|
|
|
@ -53,7 +53,8 @@ packages = None
|
||||||
|
|
||||||
if '--bjam' in sys.argv or ldflags == None or extra_cmd == None:
|
if '--bjam' in sys.argv or ldflags == None or extra_cmd == None:
|
||||||
|
|
||||||
del sys.argv[sys.argv.index('--bjam')]
|
if '--bjam' in sys.argv:
|
||||||
|
del sys.argv[sys.argv.index('--bjam')]
|
||||||
|
|
||||||
if not '--help' in sys.argv \
|
if not '--help' in sys.argv \
|
||||||
and not '--help-commands' in sys.argv:
|
and not '--help-commands' in sys.argv:
|
||||||
|
|
|
@ -1889,15 +1889,6 @@ namespace libtorrent
|
||||||
++m_remote_pieces_dled;
|
++m_remote_pieces_dled;
|
||||||
}
|
}
|
||||||
|
|
||||||
// it's important to update whether we're intersted in this peer before
|
|
||||||
// calling disconnect_if_redundant, otherwise we may disconnect even if
|
|
||||||
// we are interested
|
|
||||||
if (!t->has_piece_passed(index)
|
|
||||||
&& !t->is_seed()
|
|
||||||
&& !is_interesting()
|
|
||||||
&& (!t->has_picker() || t->picker().piece_priority(index) != 0))
|
|
||||||
t->peer_is_interesting(*this);
|
|
||||||
|
|
||||||
// it's important to not disconnect before we have
|
// it's important to not disconnect before we have
|
||||||
// updated the piece picker, otherwise we will incorrectly
|
// updated the piece picker, otherwise we will incorrectly
|
||||||
// decrement the piece count without first incrementing it
|
// decrement the piece count without first incrementing it
|
||||||
|
@ -1919,10 +1910,20 @@ namespace libtorrent
|
||||||
if (t && t->has_picker())
|
if (t && t->has_picker())
|
||||||
t->picker().check_peer_invariant(m_have_piece, this);
|
t->picker().check_peer_invariant(m_have_piece, this);
|
||||||
#endif
|
#endif
|
||||||
disconnect_if_redundant();
|
|
||||||
if (is_disconnecting()) return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// it's important to update whether we're intersted in this peer before
|
||||||
|
// calling disconnect_if_redundant, otherwise we may disconnect even if
|
||||||
|
// we are interested
|
||||||
|
if (!t->has_piece_passed(index)
|
||||||
|
&& !t->is_seed()
|
||||||
|
&& !is_interesting()
|
||||||
|
&& (!t->has_picker() || t->picker().piece_priority(index) != 0))
|
||||||
|
t->peer_is_interesting(*this);
|
||||||
|
|
||||||
|
disconnect_if_redundant();
|
||||||
|
if (is_disconnecting()) return;
|
||||||
|
|
||||||
// if we're super seeding, this might mean that somebody
|
// if we're super seeding, this might mean that somebody
|
||||||
// forwarded this piece. In which case we need to give
|
// forwarded this piece. In which case we need to give
|
||||||
// a new piece to that peer
|
// a new piece to that peer
|
||||||
|
|
Loading…
Reference in New Issue