grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backporing to 1.4.10-stable (#4110)

Browse Source 
* v1.4.10

* No reorg limit for ancient blocks

* Update registration after every write


Former-commit-id: 9480d724d04ecaa1fdccc7d9bb56ba8b3580ccf1
This commit is contained in:
Arkadiy Paronyan
2017-01-10 14:54:00 +01:00
committed by GitHub
parent 2467408a30
commit be920b490f
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/Cargo.toml
View File

@@ -3,7 +3,7 @@ description = "Ethcore utility library"
homepage = "http://ethcore.io"
license = "GPL-3.0"
name = "ethcore-util"
version = "1.4.9"
version = "1.4.10"
authors = ["Ethcore <admin@ethcore.io>"]
build = "build.rs"

2
util/network/src/connection.rs
View File

@@ -158,8 +158,8 @@ impl<Socket: GenericSocket> GenericConnection<Socket> {
}
if self.send_queue.is_empty() {
self.interest.remove(Ready::writable());
try!(io.update_registration(self.token));
}
try!(io.update_registration(self.token));
Ok(r)
})
}

2
util/src/misc.rs
View File

@@ -40,7 +40,7 @@ pub fn version() -> String {
let date_dash = if commit_date.is_empty() { "" } else { "-" };
let env = Target::env();
let env_dash = if env.is_empty() { "" } else { "-" };
format!("Parity/v{}-beta{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
format!("Parity/v{}-stable{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
}
/// Get the standard version data for this software.