Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-22 00:59:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'purple/openssl' into streaming_race_fix_2018_01_15

Browse source
This commit is contained in:
Jeff Becker 2018-01-15 08:25:58 -05:00
commit 43a751ee0b
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
124 changed files with 3097 additions and 3100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debian/patches/01-tune-build-opts.patch vendored
View file

@ -1,6 +1,5 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index bdadfe0..2f71eec 100644 index bdadfe0..2f71eec 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -9,10 +9,10 @@ DEPS := obj/make.dep @@ -9,10 +9,10 @@ DEPS := obj/make.dep

1
libi2pd/Streaming.h
View file

@ -279,7 +279,6 @@ namespace stream
Packet * NewPacket () { return new Packet; } Packet * NewPacket () { return new Packet; }
void DeletePacket (Packet * p) { delete p; } void DeletePacket (Packet * p) { delete p; }
private:
void AcceptOnceAcceptor (std::shared_ptr<Stream> stream, Acceptor acceptor, Acceptor prev); void AcceptOnceAcceptor (std::shared_ptr<Stream> stream, Acceptor acceptor, Acceptor prev);

1
libi2pd_client/SAM.h
View file

@ -126,7 +126,6 @@ namespace client
void WriteI2PDataImmediate(uint8_t * ptr, size_t sz); void WriteI2PDataImmediate(uint8_t * ptr, size_t sz);
void HandleWriteI2PDataImmediate(const boost::system::error_code & ec, uint8_t * buff); void HandleWriteI2PDataImmediate(const boost::system::error_code & ec, uint8_t * buff);
private: private:
SAMBridge& m_Owner; SAMBridge& m_Owner;