Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jj1bdx/otp
...
head fork: jj1bdx/otp
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Mar 15, 2012
@IngelaAndin IngelaAndin Mitigate Computational DoS attack c9a25ac
Gustav Simonsson Add two cherry-picked commits from R15B branch to R14B04 to provide
patch for a ssl_connection bug which was fixed in R15B but exists
in R14B04. See Sequence 12016

* Send ssl_closed notification to active ssl user when a tcp error occurs
c0cfe85
Commits on Mar 20, 2012
@IngelaAndin IngelaAndin Removed function that should not be backmerged b82e76c
@IngelaAndin IngelaAndin Prepare for patch relese
Four digit version number as we backmerged part of R15 solutions
b438fd3
Commits on Apr 03, 2012
@psyeugenic psyeugenic Update version numbers for R15B02 dev 5573888
@psyeugenic psyeugenic Merge branch 'maint' 21b03ef
Commits on Apr 04, 2012
@reedr reedr Increase ethr event and lock counting constants to allow at least +A …
…1024.
fbd0966
Commits on Apr 05, 2012
@reedr reedr erts: Add lcnt port and suspend options
* Add new suspend, location, and port_locks options to erts_debug:lock_counters.
* Init and destroy lock counting for processes and ports as appropriate.

Conflicts:

	erts/emulator/beam/erl_bif_info.c
daf8f46
Commits on Apr 10, 2012
@sverker sverker Add --no-commit option to update_primary and update_preloaded 71c3df2
@psyeugenic psyeugenic lcnt: Enhancement fixups 7693334
@reedr reedr lcnt: Let runq locks reflect actual call location efefd4b
Commits on Apr 11, 2012
Gustav Simonsson Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14 aff21f5
@sverker sverker Merge branch 'sverk/otp_build-no-commit-opt' into maint
* sverk/otp_build-no-commit-opt:
  Add --no-commit option to update_primary and update_preloaded
59c5072
@sverker sverker Merge branch 'maint' aa793b9
Gustav Simonsson Merge branch 'maint-r14' into maint-r15 fbf025a
Commits on Apr 12, 2012
@psyeugenic psyeugenic kernel: Initial doc of forgotten inet options
  * UDP: ulticast_if, multicast_loop and multicast_ttl,
    add_membership and drop_membership

  * Inet: bit8, buffer, deliver, high_watermark, linger and
    low_watermark
14867ef
@psyeugenic psyeugenic eldap: Update .gitignore cbe6549
@psyeugenic psyeugenic Update .gitignore 703d95b
Commits on Apr 13, 2012
Gustav Simonsson Merge branch 'maint-r15' into maint b94070e
Gustav Simonsson Merge branch 'maint' 7e79e3b
@psyeugenic psyeugenic kernel: Document bit8 option in inet:setopts/2
  * This is a highly specialized option which is
    probably not used and will be removed in R16
5f8c0d0
@psyeugenic psyeugenic Merge branch 'rr/wa-lcnt/OTP-10051' into maint
* rr/wa-lcnt/OTP-10051:
  lcnt: Let runq locks reflect actual call location
  lcnt: Enhancement fixups
  erts: Add lcnt port and suspend options
  Increase ethr event and lock counting constants to allow at least +A 1024.
8614542
@psyeugenic psyeugenic Merge branch 'maint' e40200f
Commits on Apr 16, 2012
@psyeugenic psyeugenic kernel: Remove bit8 option in spec
  * The option is removed to force warnings for dialyzer
50feb40
@psyeugenic psyeugenic kernel: Document tcp-, udp- and sctp_module option d64479b
@psyeugenic psyeugenic kernel: Document ifaddr option
  * same as ip option
57c50be
@psyeugenic psyeugenic Merge branch 'egil/inet-document-options/OTP-10053' into maint
* egil/inet-document-options/OTP-10053:
  kernel: Document ifaddr option
  kernel: Document tcp-, udp- and sctp_module option
  kernel: Remove bit8 option in spec
  kernel: Document bit8 option in inet:setopts/2
  kernel: Initial doc of forgotten inet options
f1a49c4
@psyeugenic psyeugenic Merge branch 'maint' df3617d
@psyeugenic psyeugenic kernel, erts: Remove bit8 option from inet aacb825
@psyeugenic psyeugenic erts: Remove bit8 option from prim_inet 7825001
@psyeugenic psyeugenic Update preloaded prim_inet.beam f7649b6
Commits on Apr 17, 2012
@psyeugenic psyeugenic Merge branch 'egil/r16/inet-remove-bit8/OTP-10056'
* egil/r16/inet-remove-bit8/OTP-10056:
  Update preloaded prim_inet.beam
  erts: Remove bit8 option from prim_inet
  kernel, erts: Remove bit8 option from inet
f21ff09
Something went wrong with that request. Please try again.