From: Dyre Tjeldvoll Date: October 2 2012 8:17am Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4081 to 4082) List-Archive: http://lists.mysql.com/commits/144926 Message-Id: <20121002081731.20741.6002.4082@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4082 Dyre Tjeldvoll 2012-10-02 Use socket.gethostname() as the server name when using the WindowsDefault browser modified: storage/ndb/mcc/request_handler.py 4081 Dyre Tjeldvoll 2012-09-27 Add ndb_setup.* rather than .py modified: support-files/mysql.spec.sh === modified file 'storage/ndb/mcc/request_handler.py' --- a/storage/ndb/mcc/request_handler.py 2012-09-20 12:19:53 +0000 +++ b/storage/ndb/mcc/request_handler.py 2012-10-02 08:08:00 +0000 @@ -377,9 +377,15 @@ def main(prefix, cfgdir): dojoz = zipfile.ZipFile(os.path.join(frontend, 'dojo.zip'), 'r') dojoz.extractall(path=frontend) dojoz.close() - + + def_server_name = 'localhost' + + if hasattr(webbrowser, 'WindowsDefault') and isinstance(webbrowser.get(), webbrowser.WindowsDefault): + # If on windows and using IE we do this to avoid IE9 bug (doesn't affect other versions of IE, there is no easy way to test + def_server_name = socket.gethostname() + cmdln_parser = optparse.OptionParser() - cmdln_parser.add_option('-N', '--server_name', action='store', type='string', default='', + cmdln_parser.add_option('-N', '--server_name', action='store', type='string', default=def_server_name, help='server name: [default: %default ]') cmdln_parser.add_option('-p', '--port', action='store', type='int', dest='port', default=8081, No bundle (reason: useless for push emails).