Permalink
Commits on Nov 14, 2012
  1. Merge branch 'ia/ssl/terminate-handling/OTP-10574' into maint

    * ia/ssl/terminate-handling/OTP-10574:
      ssl: Make sure that the ssl connection process will not hang in terminate function.
      ssl: Add default values to emulated socket options in internal record
    IngelaAndin committed Nov 14, 2012
Commits on Nov 13, 2012
  1. Merge branch 'sverk/hipe-solaris-m4-bug/OTP-10577' into maint

    * sverk/hipe-solaris-m4-bug/OTP-10577:
      erts: Change assembler comment for hipe on x86 and amd64
      erts: Fix compile error on solaris in generated hipe_amd64_bifs.S
    sverker committed Nov 13, 2012
  2. erts: Change assembler comment for hipe on x86 and amd64

    Previously done for ppc in c469d8c
    sverker committed Nov 13, 2012
  3. ssl: Make sure that the ssl connection process will not hang in termi…

    …nate function.
    
    Avoid doing gen_tcp/inet socket operations in terminate if socket
    is already closed. Call gen_tcp:recv/3 in the "data delivery workaround"
    to avoid hanging.
    IngelaAndin committed Nov 12, 2012
  4. ssl: Add default values to emulated socket options in internal record

    The absence of the active default values could cause a process leak
    IngelaAndin committed Oct 17, 2012
Commits on Nov 12, 2012
  1. Merge branch 'sverk/halfword-valgrind-suppressions' into maint

    * sverk/halfword-valgrind-suppressions:
      crypto: Add valgrind suppression for AES_cbc_encrypt
      erts: Expand valgrind suppression for zlib
      Add extra valgrind suppression file for halfword emulator
    sverker committed Nov 12, 2012
  2. Merge branch 'bjorn/compiler/binary-matching/OTP-10567' into maint

    * bjorn/compiler/binary-matching/OTP-10567:
      Fix compiler crash for binary matching and a complicated guard
    bjorng committed Nov 12, 2012
  3. Merge branch 'rickard/port-sched-bug/OTP-10556' into maint

    * rickard/port-sched-bug/OTP-10556:
      Fix bug in erts_port_task_schedule()
    rickard-green committed Nov 12, 2012
  4. Merge branch 'rickard/sched-wakeup/OTP-10476' into maint

    * rickard/sched-wakeup/OTP-10476:
      Use reduction limit in order to determine when to do wakeup
    rickard-green committed Nov 12, 2012
  5. Merge branch 'fredrik/ssh-password-conf/OTP-10511' into maint

    * fredrik/ssh-password-conf/OTP-10511:
      Ssh appup modifications
      Updated appup for ssh
      Bumped revision
      Removed some testing variables
      ssh_opts is now a proper list
      After auth rsa and dsa passwords is set to undefined
      Removing the password after auth
    gustehn committed Nov 12, 2012
Commits on Nov 9, 2012
  1. Ssh appup modifications

    gustehn committed Nov 9, 2012
  2. Merge branch 'lukas/common_test/multi_require_bug/OTP-10572' into maint

    * lukas/common_test/multi_require_bug/OTP-10572:
      Fix bug where require of same name at same config would return name in use
    garazdawi committed Nov 9, 2012
  3. Merge branch 'ia/ssl/gen-fsm-timout/OTP-10569' into maint

    * ia/ssl/gen-fsm-timout/OTP-10569:
      ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout
    IngelaAndin committed Nov 9, 2012
  4. ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout

    The gen_fsm:sync_send_all_state_event/3 timout is a client side timeout.
    If timeouts are needed we want them to be server side timeouts.
    IngelaAndin committed Nov 8, 2012
Commits on Nov 8, 2012
  1. Merge branch 'fredrik/ssh-quiet-mode/OTP-10429' into maint

    * fredrik/ssh-quiet-mode/OTP-10429:
      Doc for quiet_mode
      SSH quiet mode
    gustehn committed Nov 8, 2012
  2. Updated appup for ssh

    gustehn committed Nov 8, 2012
  3. Merge branch 'bjorn/erts/binary-append/OTP-10524' into maint

    * bjorn/erts/binary-append/OTP-10524:
      Fix binary append exceptions
    bjorng committed Nov 8, 2012
  4. Doc for quiet_mode

    gustehn committed Nov 8, 2012
  5. Merge branch 'anders/diameter/upgrade/OTP-10550' into maint

    * anders/diameter/upgrade/OTP-10550:
      Allow for no diameter on remote node in connection guard
    Anders Svensson committed Nov 8, 2012
  6. Merge branch 'anders/diameter/peer_mapping/OTP-10470' into maint

    * anders/diameter/peer_mapping/OTP-10470:
      Document peer_ref() service_info
      Use peer_ref() service_info in traffic suite
      Add service_info for a peer_ref()
    Anders Svensson committed Nov 8, 2012
  7. Merge branch 'anders/diameter/shared_transport/OTP-10443' into maint

    * anders/diameter/shared_transport/OTP-10443:
      Use multiple connections in traffic suite
      Implement service_opt() restrict_connections
      Document service_opt() restrict_connections
    Anders Svensson committed Nov 8, 2012
  8. Merge branch 'anders/diameter/sequence_masks/OTP-10445' into maint

    * anders/diameter/sequence_masks/OTP-10445:
      Redo watchdog test suite
      Update/clarify some comments
      Add reopen message from watchdog
      Add options service_info
      Add diameter_reg:wait/1
      Clarify diameter_transport doc
      Remove pre-OTP configure support
      Remove obsolete make target
      Use sequence masks in test suites
      Implement sequence masks
      Document sequence masks
    Anders Svensson committed Nov 8, 2012
Commits on Nov 7, 2012
  1. Bumped revision

    gustehn committed Nov 7, 2012
Commits on Nov 6, 2012
  1. Fix compiler crash for binary matching and a complicated guard

    The compiler would crash when attempting to compile a function
    head that did binary matching and had a complex expression using
    'andalso' and 'not'.
    
    Noticed-by: José Valim
    bjorng committed Nov 6, 2012
Commits on Nov 5, 2012
  1. Merge branch 'anders/diameter/patch/R15B02/OTP-10555' into maint-r15

    * anders/diameter/patch/R15B02/OTP-10555:
      vsn -> 1.2.1
      Update appup for OTP-10461/10550
      Allow for no diameter on remote node in connection guard
      Add missing clause for peer failover
    Erlang/OTP committed Nov 5, 2012
  2. vsn -> 1.2.1

    Anders Svensson committed Nov 5, 2012
  3. Update appup for OTP-10461/10550

    Anders Svensson committed Nov 5, 2012
  4. Merge branch 'anders/diameter/patch/R15B02/upgrade/OTP-10550' into an…

    …ders/diameter/patch/R15B02/OTP-10555
    
    * anders/diameter/patch/R15B02/upgrade/OTP-10550:
      Allow for no diameter on remote node in connection guard
    Anders Svensson committed Nov 5, 2012
  5. Merge branch 'anders/diameter/patch/R15B02/failover_error/OTP-10461' …

    …into anders/diameter/patch/R15B02/OTP-10555
    
    * anders/diameter/patch/R15B02/failover_error/OTP-10461:
      Add missing clause for peer failover
    Anders Svensson committed Nov 5, 2012
  6. SSH quiet mode

    gustehn committed Sep 14, 2012