aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-01-16[snmp] Fixed release notes. Used wrong ticket numberMicael Karlberg
OTP-9783
2012-01-12Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r14 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
2012-01-12[snmp/agent] Updated appup fileMicael Karlberg
2012-01-12[snmp/agent] Updated release notesMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Removed the (unused) serializer partMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Use unique temporary file name during vacm table dumnpingMicael Karlberg
Removed the use synchronization mechanism during vacm table dumping. This could not be placed in the master agent since it was sometimes used from the master agent. Also is was credated and used from the top agent supervisor, befor the master agent process was created... OTP-9851
2012-01-12[snmp/agent] Add common timestamp format function.Micael Karlberg
OTP-9851
2012-01-12[snmp/agent] Synchronization feature addedMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Creating a unique temporary file whe dumping vacmMicael Karlberg
Attempting to create a unique temporary file when dumping the vacm table to disk. OTP-9851
2012-01-05Merge branch 'bmk/snmp/agent/remove_use_of_old_style_fun/r14/OTP-9783' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r14
2012-01-05[snmp/agent] Changed versionMicael Karlberg
Assigned new version, 4.21.5 instedad of 4.22, for app. This version is more in line with the change. Updated release notes and appup accordingly. OTP-9783
2012-01-05[snmp/agent] Found another old-style fun (2-tuple)Micael Karlberg
OTP-9783
2012-01-05[snmp/agent] Removed use of old style tuple funsMicael Karlberg
OTP-9783
2011-11-28Merge branch 'bmk/snmp/snmp4213_integration' into maint-r14Erlang/OTP
* bmk/snmp/snmp4213_integration: Added make targets for building an snmp dialyzer plt. [compiler] Fix the --warnings/--W option parsing in the snmpc wrapper script. The short warning option was incorrectly '--w', instead of as documented '--W'. This has now been corrected. Tuncer Ayaz OTP-9718 [compiler] Improved version info printout from the MIB compiler frontend escript. OTP-9618 [agent] When sending an error message (reply) regarding snmpUnknownPDUHandlers, the agent used the wrong OID. OTP-9747 Updated appup file and release notes. OTP-9745 [agent] Version 4.20 introduced a change that broke trap sending from subagents. Due to a bug in the test code, this was not discovered, until that bug was fixed. OTP-9745 Upped the version in prep of patch. OTP-9748 Fixed expect function, which basically ignored detected errors. Also added more printouts to make it easier to follow the flow of the test. In the same spirit, changed the tags in some of the test cases so that it would be possible to distinguish one expect call form another (not always possible since some functions are used by several test cases). OTP-9748
2011-11-25Merge branch 'bmk/snmp/add_make_targets_for_dialyzer_plt_building' into ↵Micael Karlberg
bmk/snmp/snmp4213_integration
2011-11-25Added make targets for building an snmp dialyzer plt.Micael Karlberg
2011-11-25Merge branch 'bmk/snmp/compiler/fix_short_warning_option/r14/OTP-9718' into ↵Micael Karlberg
bmk/snmp/snmp4213_integration
2011-11-25[compiler] Fix the --warnings/--W option parsing in the snmpc wrapper script.Micael Karlberg
The short warning option was incorrectly '--w', instead of as documented '--W'. This has now been corrected. Tuncer Ayaz OTP-9718
2011-11-25Merge branch 'bmk/snmp/compiler/improved_version_printout/r14/OTP-9618' into ↵Micael Karlberg
bmk/snmp/snmp4213_integration
2011-11-25[compiler] Improved version info printout from theMicael Karlberg
MIB compiler frontend escript. OTP-9618
2011-11-25Merge branch 'bmk/snmp/agent/wrong_oid_for_snmpUnknownPDUHandlers/OTP-9747' ↵Micael Karlberg
into bmk/snmp/snmp4213_integration
2011-11-25[agent] When sending an error message (reply) regardingMicael Karlberg
snmpUnknownPDUHandlers, the agent used the wrong OID. OTP-9747
2011-11-25Merge branch 'bmk/snmp/agent/trapsending_from_subagents/OTP-9745' into ↵Micael Karlberg
bmk/snmp/snmp4213_integration
2011-11-25Updated appup file and release notes.Micael Karlberg
OTP-9745
2011-11-25[agent] Version 4.20 introduced a change that broke trap sending fromMicael Karlberg
subagents. Due to a bug in the test code, this was not discovered, until that bug was fixed. OTP-9745
2011-11-25Merge branch 'bmk/snmp/agent_test_expect/OTP-9748' into ↵Micael Karlberg
bmk/snmp/snmp4213_integration
2011-11-25Upped the version in prep of patch.Micael Karlberg
OTP-9748
2011-11-25Fixed expect function, which basically ignored detected errors.Micael Karlberg
Also added more printouts to make it easier to follow the flow of the test. In the same spirit, changed the tags in some of the test cases so that it would be possible to distinguish one expect call form another (not always possible since some functions are used by several test cases). OTP-9748
2011-11-16Merge commit 'build/maint-r14/2011-11-14_22.10' into maint-r14Micael Karlberg
2011-11-15Merge branch 'maint-r13' into maint-r14Micael Karlberg
2011-11-14Merge branch 'bmk/snmp/20111108/bad_gc_timer_deactivation/OTP-9690' into ↵Erlang/OTP
maint-r14 * bmk/snmp/20111108/bad_gc_timer_deactivation/OTP-9690: Bad note store GC timer deactivation. Wrong field in the state record was set (timeout instead active). Stefan Grundmann OTP-9690
2011-11-11Merge branch 'bmk/inets/inets572_integration' into maint-r14Erlang/OTP
* bmk/inets/inets572_integration: Commas and more commas... More merge cleanup. Aftermerge cleanup. [httpd] GET request with malformed header date caused server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674 Added versions 5.2, 5.1.3 and 5.1.2 again. OTP-9655 Uncommented ipv6 test cases. OTP-9655 Fixed HTML encode. First *try* to hex decode uri, and then do the actual html encode. OTP-9655 Skip catching hex decode failure. OTP-9655 Fixed hex-decoding. OTP-9655 Problems with proxy test cases. OTP-9655 Added release notes, appup and correct version. OTP-9655 The XSS prevention methods used was confused if the URL was encoded (hex-encoded). OTP-9655
2011-11-10Update release notesErlang/OTP
2011-11-10Merge branch 'dgud/mnesia/upgrade-cont/OTP-9657' into maint-r14Erlang/OTP
* dgud/mnesia/upgrade-cont/OTP-9657: Prepare release [mnesia] Fix deadlock in aborted mnesia:del_table_copy/2 [mnesia] Make all schema operations protocol aware [mnesia] Remove export of clear_table which is not a schema operation anymore [mnesia] Cleanly bring down mnesia
2011-11-10Commas and more commas...Micael Karlberg
2011-11-09More merge cleanup.Micael Karlberg
2011-11-09[httpd] GET request with malformed header date causedMicael Karlberg
server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674 Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/r14/OTP-9674' into bmk/inets/inets572_integration Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
2011-11-09[httpd] XSS prevention did not work for hex-encoded URL's.Micael Karlberg
OTP-9655 Merge branch 'bmk/inets/httpd/xss_when_erl_encoded/r14/OTP-9655' into bmk/inets/inets572_integration
2011-11-09Initial merge from r13 topic branch. With minimal cleanup.Micael Karlberg
Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/r13/OTP-9674' into bmk/inets/httpd/xss_with_bad_header_date/r14/OTP-9674 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_server/mod_responsecontrol.erl lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpd_1_1.erl lib/inets/test/httpd_SUITE.erl lib/inets/test/httpd_mod.erl lib/inets/test/httpd_test_lib.erl lib/inets/vsn.mk
2011-11-09Aftermerge cleanup.Micael Karlberg
2011-11-09Initial merge from r13 topic branch. With minimal cleanup.Micael Karlberg
Merge branch 'bmk/inets/httpd/xss_when_erl_encoded/r13/OTP-9655' into bmk/inets/httpd/xss_when_erl_encoded/r14/OTP-9655 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_uri.erl lib/inets/src/http_lib/http_util.erl lib/inets/src/http_server/httpd_file.erl lib/inets/src/http_server/httpd_request.erl lib/inets/src/http_server/httpd_request_handler.erl lib/inets/src/http_server/httpd_util.erl lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpc_SUITE.erl lib/inets/test/httpd_SUITE.erl lib/inets/test/httpd_basic_SUITE.erl lib/inets/test/httpd_test_lib.erl lib/inets/vsn.mk
2011-11-09Bad note store GC timer deactivation.Micael Karlberg
Wrong field in the state record was set (timeout instead active). Stefan Grundmann OTP-9690
2011-11-07Prepare releaseDan Gudmundsson
2011-11-07[mnesia] Fix deadlock in aborted mnesia:del_table_copy/2Dan Gudmundsson
2011-11-07[mnesia] Make all schema operations protocol awareDan Gudmundsson
Allow schema operation even if not all nodes are upgraded to latest version.
2011-11-07[mnesia] Remove export of clear_table which is not a schema operation anymoreDan Gudmundsson
2011-11-07[mnesia] Cleanly bring down mnesiaDan Gudmundsson
Aviods failing/wobbling testcase. Mnesia mishandled supervisors.
2011-11-01Merge branch 'bmk/inets/inets536_integration' into maint-r13Erlang/OTP
* bmk/inets/inets536_integration: [httpd] GET request with malformed header date caused server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674 Added versions 5.2, 5.1.3 and 5.1.2 again. OTP-9655 Uncommented ipv6 test cases. OTP-9655 Fixed HTML encode. First *try* to hex decode uri, and then do the actual html encode. OTP-9655 Skip catching hex decode failure. OTP-9655 Fixed hex-decoding. OTP-9655 Problems with proxy test cases. OTP-9655 Added release notes, appup and correct version. OTP-9655 The XSS prevention methods used was confused if the URL was encoded (hex-encoded). OTP-9655
2011-11-01[httpd] GET request with malformed header date causedMicael Karlberg
server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674 Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/OTP-9674' into bmk/inets/inets536_integration Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpd_test_lib.erl lib/inets/vsn.mk
2011-11-01[httpd] XSS prevention did not work for hex-encoded URL's.Micael Karlberg
OTP-9655 Merge branch 'bmk/inets/httpd/xss_when_erl_encoded/r13/OTP-9655' into bmk/inets/inets536_integration