Skip to content
This repository was archived by the owner on Apr 2, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
321 commits
Select commit Hold shift + click to select a range
a5feaa6
Merge remote-tracking branch 'deanberris/0.9-devel' into 0.9-devel
glynos Jul 4, 2013
f2c7a72
add
tjadevries Jul 5, 2013
29d9bea
prevent multiple main()s in case of dynamic linking of boost testing
tjadevries Jul 5, 2013
dd2d96c
Do not try to link boost test libs dynamically for this test
tjadevries Jul 5, 2013
c31e693
Merge pull request #270 from tjadevries/0.9-devel
deanberris Jul 6, 2013
197d1f0
- copy test data to build directory instead of assuming in-place build
Aug 13, 2013
290c842
Merge pull request #284 from infinity0/0.10-devel
deanberris Aug 14, 2013
c5efecc
Body generator for PUT/POST APIs
deanberris Aug 5, 2013
a4057db
Replaced BOOST_DYN_LINK code with the same options that appear on the…
glynos Aug 14, 2013
75ffadb
add CMake definitions to build and install shared libraries and headers
Aug 29, 2013
11b3d5a
Merge pull request #288 from infinity0/0.10-devel
glynos Aug 29, 2013
13debb6
fix typo
tjadevries Sep 5, 2013
ecbd636
Merge pull request #290 from tjadevries/patch-1
glynos Sep 5, 2013
088bcbd
Fixes #294 -- appease clang on unused variable.
deanberris Sep 10, 2013
2e27eee
Merge pull request #295 from deanberris/0.11-devel
deanberris Sep 10, 2013
41f7576
Fix #259 - address issues with dynamic linking mime-roundtrip.
deanberris Sep 10, 2013
1de5540
Merge pull request #296 from deanberris/0.11-devel
deanberris Sep 10, 2013
c412314
Properly fix MIME roundtrip test.
deanberris Sep 10, 2013
99b9110
Merge pull request #297 from deanberris/0.11-devel
deanberris Sep 10, 2013
79c79e6
directly use GNU install dirs rather than hard-coding matching ones
Sep 10, 2013
477100a
Merge pull request #298 from infinity0/0.10-devel
deanberris Sep 11, 2013
9328c7e
Add the first version of the BASE64 encoding functions
prantlf Sep 14, 2013
153d203
Add the first version of the stream manipulators performing the BASE6…
prantlf Sep 14, 2013
95137e2
Add tests for the BASE64 encoding
prantlf Sep 14, 2013
c98c471
Add experimental implementations of BASE64 encoding with a testing/be…
prantlf Sep 14, 2013
efd0c27
Remove padding_length() from the encoding state; the count of padding…
prantlf Sep 14, 2013
b590000
Merge pull request #300 from prantlf/base64_util
deanberris Sep 15, 2013
080b2cf
Declare the BASE64 alphabet as array of chars; not as a pointer
prantlf Sep 15, 2013
aef1e7d
Merge pull request #301 from prantlf/base64_util
deanberris Sep 16, 2013
a627916
add CMake package configuration file
torbjoernk Sep 19, 2013
f8346ae
Merge pull request #303 from torbjoernk/add-cmake-config
deanberris Sep 20, 2013
3a94563
Create hello_world_async_server_with_work_queue.cpp
codemedic Sep 27, 2013
bcb1bda
Merge pull request #307 from codemedic/0.10-devel-integration
deanberris Sep 27, 2013
77efdb3
explicitly link dependencies into the shared library; under-linking i…
Oct 27, 2013
e757294
Merge pull request #318 from infinity0/0.10-devel
deanberris Nov 8, 2013
4176bd9
Fix build for Clang in OS X.
deanberris Nov 23, 2013
2e07a3d
Remove redundant compiler checks.
deanberris Nov 23, 2013
ce12fbe
Upgrade Boost to 1.54.0; support C++11 for Clang in OS X only.
deanberris Nov 23, 2013
2e5b039
Merge pull request #326 from deanberris/0.10-devel
glynos Nov 23, 2013
f7eb2df
Closes #277 -- remove unsupported client_fwd.hpp
deanberris Nov 24, 2013
e3996b2
Closes #129, Closes #279, Closes #27
deanberris Nov 24, 2013
c1b0f16
Closes #313 -- make all client implementations use a non-case-sensiti…
deanberris Nov 24, 2013
e543647
Remove Jamfiles (Closes #316)
deanberris Nov 24, 2013
b93b0d9
Up version to 0.11.0
deanberris Nov 24, 2013
d4c2a22
Update changelog.
deanberris Nov 24, 2013
cc30f41
Adding more changes to Changelog.
deanberris Nov 24, 2013
cc2634e
fixed read timeout in chucked content response for sync keep-alive cl…
nwerensteijn Nov 24, 2013
26a8fe0
Update references to 0.10 -> 0.11; add ToC link to front page.
deanberris Nov 24, 2013
1f32c98
Updating documentation for 0.11.0
deanberris Nov 24, 2013
a60c433
Closes #277 -- remove unsupported client_fwd.hpp
deanberris Nov 24, 2013
a50660e
Closes #129, Closes #279, Closes #27
deanberris Nov 24, 2013
8d827a0
Closes #313 -- make all client implementations use a non-case-sensiti…
deanberris Nov 24, 2013
411603e
Remove Jamfiles (Closes #316)
deanberris Nov 24, 2013
b635ec8
Up version to 0.11.0
deanberris Nov 24, 2013
eedfd23
Update changelog.
deanberris Nov 24, 2013
8e621c9
Adding more changes to Changelog.
deanberris Nov 24, 2013
33b2cfa
Update references to 0.10 -> 0.11; add ToC link to front page.
deanberris Nov 24, 2013
323e90e
Updating documentation for 0.11.0
deanberris Nov 24, 2013
2b33021
Merge branch '0.10-devel' of github.com:deanberris/cpp-netlib into 0.…
deanberris Nov 24, 2013
bf64ef9
changed variable name to be complient to coding style
nwerensteijn Nov 24, 2013
43eca38
Make CMake configs work on OS X.
deanberris Nov 24, 2013
c150870
Disable some tests for Base64 encoding/decoding with libc++ due to Bo…
deanberris Nov 24, 2013
472a4ad
Merge pull request #327 from mepahoo/0.10-devel-integration
deanberris Nov 24, 2013
e8ee7e6
Mitigate #287 from failing the build.
deanberris Nov 24, 2013
d05c0fc
Update changelog with known issue for Base64 encoding/decoding test.
deanberris Nov 24, 2013
30c53ea
Merge branch '0.10-devel' of git://github.com/cpp-netlib/cpp-netlib i…
deanberris Nov 24, 2013
603a4e5
Rebuilding documentation.
deanberris Nov 24, 2013
af25d98
Update the version numbers in CMakeLists
deanberris Nov 26, 2013
ef186cf
Disabling Base64 encoding/decoding tests until they are ready.
deanberris Nov 26, 2013
cf3cd2a
Minor fix to formatting of whats_new.rst
glynos Nov 27, 2013
72ee36e
Minor fix applied in order to build with OpenSSL on Windows.
glynos Nov 29, 2013
403f659
Added all HTTP status codes
patlecat Dec 1, 2013
afb1971
Backward compatability maintained
patlecat Dec 1, 2013
561c75a
Merge pull request #336 from patlecat/0.11-devel
deanberris Dec 1, 2013
a6c0c48
cmake entries for hello_world_async_server_with_work_queue
codemedic Dec 2, 2013
6abffd6
Add static library note to linux section.
kaspervandenberg Dec 2, 2013
bfbada5
Remove Linux part of note from Windows section.
kaspervandenberg Dec 2, 2013
806ba77
Copy where to find static libraries to linux section.
kaspervandenberg Dec 2, 2013
288d3fc
Make install and using cpp-netlib.
kaspervandenberg Dec 2, 2013
c96464d
Merge pull request #339 from codemedic/0.11-devel-integration
deanberris Dec 3, 2013
6efa9d6
sudo make install
kaspervandenberg Dec 3, 2013
27a7eac
Fix indent
kaspervandenberg Dec 3, 2013
8de9c5c
Merge pull request #1 from kaspervandenberg/0.11-doc
kaspervandenberg Dec 3, 2013
ceb1eb2
Support Utf8 characters in the asynchronous connection http header na…
Dec 3, 2013
f623923
Correct spelling of issuing
kaspervandenberg Dec 3, 2013
564cafa
Updated header parser test case, removed duplicate status code
Dec 4, 2013
03e6e13
Merge pull request #340 from kaspervandenberg/0.11-devel-integration
deanberris Dec 5, 2013
1acb750
Fix duplicate declaration of enum value
deanberris Dec 5, 2013
172cf88
Merge pull request #343 from deanberris/0.11-devel-integration
deanberris Dec 5, 2013
ad028b6
Merge branch '0.11-devel' of https://github.com/cpp-netlib/cpp-netlib…
Dec 5, 2013
9d9ab23
Fixed copyright
Dec 5, 2013
21c518d
Merge pull request #341 from rubu/0.11-devel
deanberris Dec 5, 2013
9ca0703
Fix CMakeLists.txt for compilation on windows
codemedic Dec 10, 2013
c6464a0
Merge pull request #345 from codemedic/0.11-devel
deanberris Dec 12, 2013
4eac17e
cv-qualifier should be removed before checking the Header concept
daedric Dec 12, 2013
8c15fa8
Merge pull request #347 from daedric/remove_cv_qualifier
deanberris Dec 12, 2013
947269e
Add .ycm_extra_conf for users that use YCM
deanberris Dec 16, 2013
8d9538f
Fixes #346 - add an option to always verify peer
deanberris Dec 16, 2013
64d7419
Merge pull request #349 from deanberris/0.11-devel
glynos Dec 16, 2013
4799363
Update documentation for release.
deanberris Dec 20, 2013
d31462f
Generated docs for 0.11.0 release
deanberris Dec 20, 2013
a43992c
Merge pull request #353 from deanberris/0.11-devel
deanberris Dec 30, 2013
2d7f5c0
added ws2_32 and wsock32 target libraries to cmake files that is requ…
tghosgor Dec 31, 2013
326648e
Merge pull request #355 from metherealone/0.11-devel
deanberris Jan 6, 2014
b649d05
Added a client certificate support.
redboltz Jan 17, 2014
8c28ccc
Merge pull request #361 from redboltz/support_client_certificate
deanberris Jan 20, 2014
bbf431c
Backport fix for #163 into 0.11.0
deanberris Jan 20, 2014
94c6461
Update documentation for fixes.
deanberris Jan 20, 2014
2ed0ff8
Add documentation for new options.
deanberris Jan 20, 2014
1e075a1
Merge pull request #369 from deanberris/0.11-devel-backport-163-patch
deanberris Jan 20, 2014
a7420bc
Update documentation for 0.11-rc4 (and final) release.
deanberris Jan 25, 2014
cf50512
Merge pull request #373 from deanberris/0.11-devel-docs
deanberris Jan 25, 2014
b598ac2
fix build path for mime test
infinity0 Feb 7, 2014
5c8d9ab
Merge pull request #379 from infinity0/0.11-devel
deanberris Feb 8, 2014
edfa579
#389: fix typo
sumarlidason Apr 3, 2014
4522975
Merge pull request #390 from sumarlidason/0.11-devel
deanberris Apr 3, 2014
b7488dd
Add SSL support
jellevdd Apr 25, 2014
a9e23a8
Add copyright
jellevdd May 15, 2014
e46a746
Merge pull request #397 from jellevdd/0.11-devel-integration
deanberris May 19, 2014
c8908c1
Add documentation for SSL support
jellevdd May 21, 2014
f693104
Closes #399: Fix compiler error on VS2010.
Virtual-X May 21, 2014
f264f25
Update to documentation/add example
jellevdd May 21, 2014
c15e98f
Merge pull request #398 from jellevdd/0.11-devel-integration
deanberris May 22, 2014
8c4a9da
Merge pull request #400 from Virtual-X/0.11-devel
deanberris May 22, 2014
ef60d4a
close const string fix
leecoder Jun 12, 2014
1b11ec6
Avoid self join
leecoder Jun 17, 2014
9bd4e4f
rollback for pull reguest
leecoder Jun 17, 2014
ce53598
Merge pull request #402 from leecoder/0.11-devel
deanberris Jun 18, 2014
93a9630
Added client timeout option
leecoder Jun 19, 2014
8510393
Merge pull request #403 from leecoder/0.11-devel
deanberris Jun 19, 2014
24d8139
Added CMake options to disable building tests and examples
cmorse Jun 20, 2014
65713d8
Merge pull request #404 from cmorse/0.11-devel
deanberris Jun 21, 2014
2be7e30
Async thr wait in basic_client_facade dtor
leecoder Jun 23, 2014
c355924
Update facade.hpp
leecoder Jun 25, 2014
770858b
Merge pull request #405 from leecoder/0.11-devel
deanberris Jun 25, 2014
4b6ea5a
Fix order of members
deanberris Jun 24, 2014
df2db8b
Fix dependencies for openssl.
deanberris Jun 24, 2014
7af6653
Reorder fields to fix warnings.
deanberris Jun 25, 2014
80826f0
enhancing response incremental parser
leecoder Jun 26, 2014
f0eaf48
Merge pull request #408 from leecoder/0.11-devel
deanberris Jun 27, 2014
552749b
Fix to overwrite connection header
leecoder Jul 1, 2014
01bf00c
Merge pull request #409 from leecoder/0.11-devel
deanberris Jul 1, 2014
2174385
Adding .travis.yml
leecoder Jul 3, 2014
f36b485
Fixes for ci build errors
leecoder Jul 4, 2014
e484aa2
Merge pull request #411 from leecoder/0.11-devel
deanberris Jul 4, 2014
a63a417
Added .travis.yml
glynos Dec 16, 2013
52466d9
Update .travis.yml
leecoder Jul 9, 2014
6f0eba7
Merge pull request #412 from leecoder/0.11-devel
deanberris Jul 17, 2014
65bf2b2
Adds missing include.
povilasb Jul 21, 2014
3ff2fcb
Merge pull request #415 from povilasb/0.11-devel-fix-includes
deanberris Jul 22, 2014
e4790ef
Improvements of async connection timeout
leecoder Jul 28, 2014
3bc6f9d
Merge pull request #417 from leecoder/0.11-devel
deanberris Jul 28, 2014
ea81be2
Fixing for abnormal response
leecoder Jul 29, 2014
4303c44
Merge pull request #418 from leecoder/0.11-devel
deanberris Jul 30, 2014
5ba12c0
Documentation and version update to 0.11.1
deanberris Aug 12, 2014
650b126
Update generated docs
deanberris Aug 12, 2014
28ba508
Merge pull request #420 from deanberris/0.11-devel
glynos Aug 16, 2014
55e814b
hello_world_server now builds on MSVC.
glynos Aug 25, 2014
25e7a38
Various changes investigating short reads
deanberris Aug 27, 2014
466600d
Documentation updates on HTTP client
deanberris Aug 27, 2014
bd0cf0b
Merge pull request #428 from deanberris/0.11-devel-docfix
glynos Aug 27, 2014
cc1d5ea
Conditional async_client liftetime_thread creation
eakraly Sep 1, 2014
431b31f
HTTPS Client Feature Documentation
deanberris Sep 1, 2014
eff6ea7
Add generated HTML
deanberris Sep 1, 2014
c0f7444
Fix uri swap crash
Sep 1, 2014
22375ba
Fix tabs
eakraly Sep 1, 2014
e5d08d2
Update HTTP Server documentation.
deanberris Sep 1, 2014
8d7972b
Merge pull request #433 from deanberris/0.11-devel-docfix-server
glynos Sep 1, 2014
addf968
Create thread in async_client when io_service is own
eakraly Sep 1, 2014
01743e2
Merge pull request #431 from eakraly/0.11-devel
deanberris Sep 2, 2014
a59ed53
Merge pull request #1 from cpp-netlib/0.11-devel
eakraly Sep 2, 2014
3482012
Fix documentation of BOOST_NETWORK_ENABLE_HTTPS
deanberris Sep 2, 2014
0746859
Regenerate updated documentation
deanberris Sep 2, 2014
94f20b9
Merge pull request #434 from deanberris/0.11-devel-docfix-https-refin…
deanberris Sep 2, 2014
8df6dcc
Fixed bug in getting the authority when there are parts missing.
glynos Sep 2, 2014
de660e0
Fix compilation errors for projects using BOOST_BIND_NO_PLACEHOLDERS.
kzemek Sep 4, 2014
2308a7e
Merge pull request #437 from kzemek/0.11-devel-BOOST_BIND_NO_PLACEHOL…
deanberris Sep 6, 2014
b19419c
Merge pull request #436 from glynos/issue_364
deanberris Sep 6, 2014
ab09a62
Add .clang-format to 0.11-devel
deanberris Sep 6, 2014
15b6206
Tweak clang-format config.
deanberris Sep 6, 2014
e5ea5b5
clang-format -i `find . -name "*.*pp"`
deanberris Sep 6, 2014
b46340e
Do not indent namespaces.
deanberris Sep 6, 2014
008d96d
clang-format -i `find . -name "*.*pp"`
deanberris Sep 6, 2014
c8b16f5
Always break template decls
deanberris Sep 6, 2014
5a75c14
clang-format -i `find . -name "*.*pp"`
deanberris Sep 6, 2014
95c6e1f
Add CI for Boost 1.55 and 1.56
deanberris Sep 6, 2014
731a7a8
Merge pull request #438 from deanberris/0.11-devel-clangformat
deanberris Sep 6, 2014
9c0f914
Workaround Boost.Optional 1.56.0 MSVC 2010 Issue
deanberris Sep 6, 2014
752f717
Apparently 1.56.0 is not supported yet
deanberris Sep 6, 2014
a785852
Enable workaround for higher versions of MSVC.
glynos Sep 7, 2014
41f8d87
Merge pull request #439 from deanberris/0.11-devel-travis-newboosts
glynos Sep 7, 2014
cc35a7a
Removes trailing white spaces.
povilasb Sep 8, 2014
e3e27a9
Fixes HTTP response status wrapper reference.
povilasb Sep 8, 2014
f650e09
Removes trailing white space.
povilasb Sep 8, 2014
49f6519
Removes trailing white spaces.
povilasb Sep 8, 2014
df6d691
Fixes sphinx 'note' and 'warning' directive formatting.
povilasb Sep 8, 2014
7af29d5
Replaces tabs with spaces in HTTP client example.
povilasb Sep 8, 2014
a9bc4e5
Updates generated HTML documentation.
povilasb Sep 8, 2014
c56a463
Merge pull request #441 from povilasb/0.11-devel-docfix-http-response…
deanberris Sep 8, 2014
6f46be9
Added server-side support for all HTTP status codes
lyytinen Sep 9, 2014
6d4a505
Added missing return statement
lyytinen Sep 9, 2014
4c7fa25
Removed whitespace
lyytinen Sep 9, 2014
e950d1b
Merge pull request #443 from lyytinen/0.11-devel-missing-status-codes
deanberris Sep 10, 2014
3bc72fb
the recommended path is ${prefix}/lib/cmake/${package}
infinity0 Sep 14, 2014
d4070db
Merge pull request #445 from infinity0/0.11-devel
deanberris Sep 15, 2014
5368f89
Fix for issue #419
Sep 16, 2014
36cf176
Made as_optional() visible to MSVC builds only
Sep 18, 2014
bdbd612
Added better IPv6 parsing to the URI, and cleaned up some warnings.
glynos Sep 18, 2014
03b34d6
Merge pull request #448 from glynos/0.11-devel-uri-ipv6
deanberris Sep 19, 2014
3229d2a
Merge pull request #446 from lyytinen/0.11-devel-fix-for-419
deanberris Sep 19, 2014
ec4b883
Merge pull request #2 from cpp-netlib/0.11-devel
eakraly Oct 11, 2014
2514f4b
Verify hostname matches certificate
eakraly Oct 12, 2014
918ea9a
Verify hostname only when always_verify==true
eakraly Oct 12, 2014
82651b6
Add missing parameter in abstract class declaration
eakraly Oct 13, 2014
ceed0b5
Cleanup spaces and tabs
eakraly Oct 13, 2014
b1f305b
Add missing parameter to handle_resolved method
eakraly Oct 13, 2014
2028c55
Merge pull request #455 from eakraly/0.11-devel
deanberris Oct 13, 2014
3e5607f
Supressed unused variable warning.
povilasb Nov 7, 2014
f1f4a43
Refactored code.
povilasb Nov 7, 2014
03efd34
Supressed unused parameter warnings.
povilasb Nov 7, 2014
7b93773
Added todo notes for dberris to review supressed unused parameter war…
povilasb Nov 10, 2014
e5dcaa6
Merge pull request #465 from povilasb/0.11-devel-fix-warnings
deanberris Nov 11, 2014
6afd3a7
Update async_connection.hpp
wujunzhuo Dec 1, 2014
be44d50
Merge pull request #469 from wujunzhuo/0.11-devel
deanberris Dec 1, 2014
305f9cd
Allowed IPv6 connections by fixing the resolver
Dec 8, 2014
fe70d72
Merge pull request #471 from riarheos/0.11-devel
deanberris Dec 10, 2014
449b8f5
Verify hostname matches certificate
eakraly Oct 12, 2014
ff42fcf
Verify hostname only when always_verify==true
eakraly Oct 12, 2014
86d28c1
Add missing parameter in abstract class declaration
eakraly Oct 13, 2014
40f8c42
Cleanup spaces and tabs
eakraly Oct 13, 2014
4c4fc15
Add missing parameter to handle_resolved method
eakraly Oct 13, 2014
11a1a2e
Supressed unused variable warning.
povilasb Nov 7, 2014
a35f16e
Refactored code.
povilasb Nov 7, 2014
45bbd24
Supressed unused parameter warnings.
povilasb Nov 7, 2014
f2963b6
Added todo notes for dberris to review supressed unused parameter war…
povilasb Nov 10, 2014
83bd921
Update async_connection.hpp
wujunzhuo Dec 1, 2014
9f123b3
Allowed IPv6 connections by fixing the resolver
Dec 8, 2014
b28c807
Merge branch '0.11-devel' of github.com:cpp-netlib/cpp-netlib into 0.…
deanberris Dec 17, 2014
0695d62
- fix patch version
infinity0 Dec 21, 2014
4c428ab
use standard libdir (which is an arch triple on Debian) instead of ha…
infinity0 Dec 21, 2014
83565d7
Peer verification using environment variables
clunietp Jan 1, 2015
a3102e9
formatting
clunietp Jan 1, 2015
7287548
Merge pull request #477 from infinity0/0.11-devel
deanberris Jan 2, 2015
07aa9fd
Merge pull request #481 from trent33/0.11-devel
deanberris Jan 2, 2015
15ece5a
removed unused function that caused compilation warnings on GCC
el-bart Feb 1, 2015
ba3b3f3
GCC warning on signed/unsigned comparison fixed
el-bart Feb 1, 2015
6e090b3
Merge pull request #494 from el-bart/0.11-devel
deanberris Feb 2, 2015
6f229d8
Merge pull request #1 from cpp-netlib/0.11-devel
wujunzhuo Feb 16, 2015
9116322
catch exceptions in parse_headers
wujunzhuo Feb 16, 2015
53f3479
Merge pull request #498 from wujunzhuo/0.11-devel
deanberris Feb 16, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
38 changes: 38 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
BasedOnStyle: Google
AccessModifierOffset: -1
ConstructorInitializerIndentWidth: 4
AlignEscapedNewlinesLeft: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: true
AlwaysBreakTemplateDeclarations: true
AlwaysBreakBeforeMultilineStrings: true
BreakBeforeBinaryOperators: false
BreakConstructorInitializersBeforeComma: false
BinPackParameters: true
ColumnLimit: 80
ConstructorInitializerAllOnOneLineOrOnePerLine: true
DerivePointerBinding: true
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: true
MaxEmptyLinesToKeep: 1
ObjCSpaceBeforeProtocolList: false
PenaltyBreakComment: 60
PenaltyBreakString: 1000
PenaltyBreakFirstLessLess: 120
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerBindsToType: true
SpacesBeforeTrailingComments: 2
Cpp11BracedListStyle: true
Standard: Auto
IndentWidth: 2
TabWidth: 4
UseTab: false
BreakBeforeBraces: Attach
IndentFunctionDeclarationAfterType: true
SpacesInParentheses: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpaceAfterControlStatementKeyword: true
46 changes: 46 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
language:
- cpp

compiler:
- gcc
- clang

env:
- BOOST_VER=1.54.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release"
- BOOST_VER=1.54.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release"
- BOOST_VER=1.54.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug"
- BOOST_VER=1.54.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug"
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release"
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release"
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug"
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug"

before_install:
- if [ "${CXX}" == "g++" ] || [ ${BUILD_SHARED_LIBS} = "OFF" ]; then
sudo add-apt-repository ppa:boost-latest/ppa --yes;
sudo apt-get update;
fi
- if [ "${CXX}" == "clang++" ] && [ ${BUILD_SHARED_LIBS} = "ON" ]; then
curl -s http://cznic.dl.sourceforge.net/project/boost/boost/${BOOST_VER}/boost_${BOOST_VER//./_}.tar.bz2|tar xfj - -C ..;
export BOOST_ROOT=$TRAVIS_BUILD_DIR/../boost_${BOOST_VER//./_};
fi

install:
- if [ "${CXX}" == "g++" ] || [ ${BUILD_SHARED_LIBS} = "OFF" ]; then
sudo apt-get install libboost${BOOST_VER/%.0/}-all-dev;
fi
- if [ "${CXX}" == "clang++" ] && [ ${BUILD_SHARED_LIBS} = "ON" ]; then
cd $BOOST_ROOT;
./bootstrap.sh --with-toolset=$CC;
./b2 -j4 --stagedir=.;
cd -;
fi

script:
- cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
- make
- make test

after_failure:
- cat Testing/Temporary/LastTest.log
72 changes: 72 additions & 0 deletions .ycm_extra_conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Copyright 2013 Google, Inc.
# Copyright 2013 Dean Michael Berris <dberris@google.com>
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
#
# Project-wide configuration for YouCompleteMe Vim plugin.
#
# Based off of Valloric's .ycm_conf_extra.py for YouCompleteMe:
# https://github.com/Valloric/YouCompleteMe/blob/master/cpp/ycm/.ycm_extra_conf.py
#

import os
import ycm_core

flags = [
'-Wall',
'-Wextra',
'-Werror',
'-std=c++03',
'-isystem',
'.',
'-isystem',
'/usr/include',
'-isystem',
'/usr/include/c++/4.6',
'-isystem',
'/usr/include/clang/3.0/include',
'-isystem',
'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1',
'-I',
os.environ['BOOST_ROOT'],
# Always enable debugging for the project when building for semantic
# completion.
'-DBOOST_NETWORK_DEBUG',
]

def DirectoryOfThisScript():
return os.path.dirname(os.path.abspath(__file__))


def MakeRelativePathsInFlagsAbsolute(flags, working_directory):
if not working_directory:
return list(flags)
new_flags = []
make_next_absolute = False
path_flags = ['-isystem', '-I', '-iquote', '--sysroot=']
for flag in flags:
new_flag = flag
if make_next_absolute:
make_next_absolute = False
if not flag.startswith('/'):
new_flag = os.path.join(working_directory, flag)

for path_flag in path_flags:
if flag == path_flag:
make_next_absolute = True
break
if flag.startswith(path_flag):
path = flag[len(path_flag):]
new_flag = path_flag + os.path.join(working_directory, path)
break

if new_flag:
new_flags.append(new_flag)
return new_flags


def FlagsForFile(filename):
relative_to = DirectoryOfThisScript()
final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to)
return {'flags': final_flags, 'do_cache': True }
113 changes: 107 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,75 @@

cmake_minimum_required(VERSION 2.8)
project(CPP-NETLIB)
set(Boost_USE_STATIC_LIBS ON)

option( CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF )
option( CPP-NETLIB_BUILD_TESTS "Build the cpp-netlib project tests." ON)
option( CPP-NETLIB_BUILD_EXAMPLES "Build the cpp-netlib project examples." ON)

include(GNUInstallDirs)

# determine install path for CMake config files
if(WIN32 AND NOT CYGWIN)
set(DEF_INSTALL_CMAKE_DIR CMake)
else()
set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/cppnetlib)
endif()
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")

# Make relative cmake install path absolute (needed later on)
if(NOT IS_ABSOLUTE "${INSTALL_CMAKE_DIR}")
set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}")
endif()


if(CPP-NETLIB_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
message (STATUS "Linking boost testing libs dynamically...")
set(Boost_USE_STATIC_LIBS OFF)
set(CPP-NETLIB_BUILD_SHARED_LIBS ON)
set(BUILD_SHARED_LIBS ON)
add_definitions(-DBOOST_TEST_DYN_LINK)
else()
set(Boost_USE_STATIC_LIBS ON)
set(CPP-NETLIB_BUILD_SHARED_LIBS OFF)
set(BUILD_SHARED_LIBS OFF)
endif()

set(Boost_USE_MULTI_THREADED ON)
find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options )
find_package( Boost 1.54.0
REQUIRED unit_test_framework system regex date_time thread filesystem
program_options chrono atomic )
find_package( OpenSSL )
find_package( Threads )
set(CMAKE_VERBOSE_MAKEFILE true)

set(CPPNETLIB_VERSION_MAJOR 0) # MUST bump this whenever we make ABI-incompatible changes
set(CPPNETLIB_VERSION_MINOR 11)
set(CPPNETLIB_VERSION_PATCH 1)
set(CPPNETLIB_VERSION_STRING ${CPPNETLIB_VERSION_MAJOR}.${CPPNETLIB_VERSION_MINOR}.${CPPNETLIB_VERSION_PATCH})

if (CMAKE_BUILD_TYPE MATCHES Debug)
add_definitions(-DBOOST_NETWORK_DEBUG)
endif()

if (OPENSSL_FOUND)
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
include_directories(${OPENSSL_INCLUDE_DIR})
endif()

if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# We want to link in C++11 mode if we're using Clang and on OS X.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11 -stdlib=libc++")
else()
# We just add the -Wall and a high enough template depth
# flag for Clang in other systems.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256")
endif()
endif()


if (Boost_FOUND)
if (MSVC)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
Expand All @@ -30,11 +84,58 @@ if (Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
enable_testing()
add_subdirectory(libs/network/src)
add_subdirectory(libs/network/test)
if (NOT MSVC)
if (CPP-NETLIB_BUILD_TESTS)
add_subdirectory(libs/network/test)
endif (CPP-NETLIB_BUILD_TESTS)
add_subdirectory(libs/network/experiment)
if (NOT MSVC AND CPP-NETLIB_BUILD_TESTS)
add_subdirectory(libs/mime/test)
endif(NOT MSVC)
add_subdirectory(libs/network/example)
endif(NOT MSVC AND CPP-NETLIB_BUILD_TESTS)
if (CPP-NETLIB_BUILD_EXAMPLES)
add_subdirectory(libs/network/example)
endif (CPP-NETLIB_BUILD_EXAMPLES)
endif(Boost_FOUND)

if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
endif()

enable_testing()

install(DIRECTORY boost DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

###
## Export Targets
# (so cpp-netlib can be easily used by other CMake projects)
# [see http://www.cmake.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file]

# Add all targets to the build-tree export set
export(TARGETS cppnetlib-client-connections cppnetlib-server-parsers cppnetlib-uri
FILE "${PROJECT_BINARY_DIR}/cppnetlibTargets.cmake")
# Export the package for use from the build-tree
# (this registers the build-tree with a global CMake-registry)
export(PACKAGE cppnetlib)
# Create the cppnetlibConfig.cmake and cppnetlibConfigVersion files
file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
"${CMAKE_INSTALL_FULL_INCLUDEDIR}")
# ... for the build tree
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}")
configure_file(cppnetlibConfig.cmake.in
"${PROJECT_BINARY_DIR}/cppnetlibConfig.cmake" @ONLY)
# ... for the install tree
set(CONF_INCLUDE_DIRS "\${CPPNETLIB_CMAKE_DIR}/${REL_INCLUDE_DIR}")
configure_file(cppnetlibConfig.cmake.in
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cppnetlibConfig.cmake" @ONLY)
# ... for both
configure_file(cppnetlibConfigVersion.cmake.in
"${PROJECT_BINARY_DIR}/cppnetlibConfigVersion.cmake" @ONLY)
# Install the cppnetlibConfig.cmake and cppnetlibConfigVersion.cmake
install(FILES
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cppnetlibConfig.cmake"
"${PROJECT_BINARY_DIR}/cppnetlibConfigVersion.cmake"
DESTINATION "${INSTALL_CMAKE_DIR}"
COMPONENT dev)
# Install the export set for use with the install-tree
install(EXPORT cppnetlibTargets
DESTINATION "${INSTALL_CMAKE_DIR}"
COMPONENT dev)
19 changes: 0 additions & 19 deletions Jamroot

This file was deleted.

Loading