aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-10-16add path to vcredist.exe for VS-2013Henrik Nord
2015-10-16public_key: add/update -spec for ssh functionsHans Nilsson
2015-10-16ssh, public_key: use pubkey encode/decode in app public_keyHans Nilsson
2015-10-16ssh, public_key: Change EC Public Key representation to what was intendedHans Nilsson
2015-10-16Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2015-10-16Merge branch 'maint-18' into maintHenrik Nord
Conflicts: lib/ssh/vsn.mk
2015-10-15Merge branch 'maint'Zandra
2015-10-15Merge branch 'kostis/hipe-bs-construct-zero-size' into maintZandra
* kostis/hipe-bs-construct-zero-size: Fix edge case of Size = 0 in bs_put_integer OTP-13048
2015-10-15Merge branch 'maint'Zandra
2015-10-15Merge branch 'appeltel/docfix_osx_install_wx_branch' into maintZandra
* appeltel/docfix_osx_install_wx_branch: Fix osx install wxWidgets instructions
2015-10-15Updated OTP versionOTP-18.1.3Erlang/OTP
2015-10-15Update release notesErlang/OTP
2015-10-15Merge branch 'hans/ssh/include_gex_group1/OTP-13046' into maint-18Erlang/OTP
* hans/ssh/include_gex_group1/OTP-13046: ssh: set dh_gex default to group14 ssh: Add a 1024 group to the list of key gex groups
2015-10-15ssh: set dh_gex default to group14Hans Nilsson
2015-10-15ssh: Add a 1024 group to the list of key gex groupsHans Nilsson
2015-10-15Merge branch 'bjorn/remove-webtool/OTP-13004'Björn Gustavsson
* bjorn/remove-webtool/OTP-13004: Remove the deprecated webtool application
2015-10-14Remove the deprecated webtool applicationBjörn Gustavsson
2015-10-14Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2015-10-14Merge branch 'maint-18' into maintHenrik Nord
Conflicts: lib/ssh/vsn.mk
2015-10-14Add details on the FOP formatterDerek Brown
I found that I needed to take the two steps I added to INSTALL.md for this PR, or else fop execution when doing a "make docs" would fail with either a Java ClassNotFoundException or command "fop" not found: * Adding the FOP install directory to $FOP_HOME * Adding the fop script to $PATH
2015-10-13Merge branch 'maint'Hans Nilsson
2015-10-13Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2015-10-13Merge branch 'hans/ssh/cuddle_spec' into maintHans Nilsson
2015-10-13Updated OTP versionOTP-18.1.2Erlang/OTP
2015-10-13Update release notesErlang/OTP
2015-10-13Merge branch 'hans/ssh/option_max_channels/OTP-13036' into maint-18Erlang/OTP
* hans/ssh/option_max_channels/OTP-13036: ssh: update vsn.mk ssh: Option max_channels added.
2015-10-13inets: scheme validation fun for http_uriKirilll Zaborsky
http_uri:parse_scheme function should allow checking scheme of URIs otherwise it could be easily abused to reach limit number of atoms in the VM
2015-10-13Merge branch 'maint'Henrik Nord
2015-10-13Merge branch 'entropiae/patch-2' into maintHenrik Nord
* entropiae/patch-2: Fixed typo in ets documentation
2015-10-13Fixed typo in ets documentationRiccardo
2015-10-13Merge branch 'maint'Henrik Nord
2015-10-13Merge branch 'RichMorin/patch-1' into maintHenrik Nord
* RichMorin/patch-1: fix capitalization of headings OTP-13044
2015-10-13Merge branch 'maint'Henrik Nord
2015-10-13Merge branch 'scrapinghub/qrilka-patch-1' into maintHenrik Nord
* scrapinghub/qrilka-patch-1: Small misprint OTP-13043
2015-10-13Small misprintKirill Zaborsky
2015-10-13inets: fix suppport of HTTP headers with obs-foldKirilll Zaborsky
httpc should not fail when response contains (now deprecated) multiline HTTP headers constructed with obs-folds. And as RFC7230 specifies user agent should replace obs-folds with spaces.
2015-10-13Merge branch 'maint'Henrik Nord
2015-10-13Merge branch 'legoscia/callback-arrow-no-newline' into maintHenrik Nord
* legoscia/callback-arrow-no-newline: Don't add newline after arrow on -callback lines OTP-13042
2015-10-13Merge branch 'maint'Henrik Nord
2015-10-13Merge branch 'kostis/hipe-native-bif-warning' into maintHenrik Nord
* kostis/hipe-native-bif-warning: Take out unused code that results in a gcc warning OTP-13041
2015-10-12Merge branch 'maint'Zandra
2015-10-12Merge branch 'stolen/unified_dist' into maintZandra
OTP-13040 * stolen/unified_dist: kernel: inet6_tcp_dist: reuse inet_tcp_dist code Conflicts: lib/kernel/src/inet_tcp_dist.erl
2015-10-12erts: Don't run processes tests on lcnt with little memoryLukas Larsson
2015-10-12Merge branch 'maint'Hans Nilsson
2015-10-12Merge branch 'hans/ssh/cuddle_docs' into maintHans Nilsson
2015-10-12ssh: polished ssh.xmlHans Nilsson
Some changes in the SSH section at top (supported algorithms). Added links to default_algorithms and preferred_algorithms in the SSH section.
2015-10-12Merge branch 'bjorn/erts/builtin/OTP-13034'Björn Gustavsson
* bjorn/erts/builtin/OTP-13034: Teach erlang:is_builtin/3 that erlang:apply/3 is built-in
2015-10-12ssh: set dh_gex default to group14Hans Nilsson
2015-10-12ssh: add info on GEX algos in ssh_alghoritms:init_suiteHans Nilsson
2015-10-12ssh: updatated spec for ssh:daemonHans Nilsson