[Armagetronad-commits] SF.net SVN: armagetronad:[9045] armagetronad/trunk

[<z-...@us...>]

Revision: 9045
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9045&view=rev
Author:   z-man
Date:     2009-02-25 12:14:21 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Merging branch 0.2.8 from revision 9041 to 9044:
 ------------------------------------------------------------------------
 r9044 | bazaarmagetron | 2009-02-25 13:07:45 +0100 (Wed, 25 Feb 2009) | 2 lines
 
 Manuel Moos: Updated.
 
 ------------------------------------------------------------------------
 r9043 | bazaarmagetron | 2009-02-25 13:06:49 +0100 (Wed, 25 Feb 2009) | 4 lines
 
 author: Manuel Moos
 Switched to utf8 as the encoding used for scrambling passwords and
 sending usernames to the authority.
 ( Not merging, of course. This is already done here. )
 
 ------------------------------------------------------------------------

Revision Links:
--------------
    http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9041&view=rev

Modified Paths:
--------------
    armagetronad/trunk/armagetronad/NEWS
    armagetronad/trunk/armagetronad/batch/authentication_reference.php
    armagetronad/trunk/armagetronad/src/network/nKrawall.cpp

Property Changed:
----------------
    armagetronad/trunk/


Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /armagetronad/branches/0.2.8:8751-8852,8855-9041
   + /armagetronad/branches/0.2.8:8751-8852,8855-9044

Modified: armagetronad/trunk/armagetronad/NEWS
===================================================================
--- armagetronad/trunk/armagetronad/NEWS	2009-02-25 12:07:45 UTC (rev 9044)
+++ armagetronad/trunk/armagetronad/NEWS	2009-02-25 12:14:21 UTC (rev 9045)
@@ -90,6 +90,8 @@
 Changes since 0.2.8.3_beta1:
 ============================
 
+- Authentication routines now use utf8 as forward- compatibility with
+  trunk. Previously, non-ASCII usernames simply didn't work at all.
 - Better lag slide protection: clients no longer get confused when
   the server sends their cycle back in time, and the server no longer
   does that for old clients.

Modified: armagetronad/trunk/armagetronad/batch/authentication_reference.php
===================================================================
--- armagetronad/trunk/armagetronad/batch/authentication_reference.php	2009-02-25 12:07:45 UTC (rev 9044)
+++ armagetronad/trunk/armagetronad/batch/authentication_reference.php	2009-02-25 12:14:21 UTC (rev 9045)
@@ -72,7 +72,8 @@
     // of users, you may just get away with expanding this
     // array.
     $passwords= array (
-        'test' => 'password' // clever choice there, test
+        'test' => 'password', // clever choice there, test
+        'z-män' => 'passwörd' // test for utf8 usernames and passwords
         );
 
     $password = $passwords[ $user ];

Modified: armagetronad/trunk/armagetronad/src/network/nKrawall.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nKrawall.cpp	2009-02-25 12:07:45 UTC (rev 9044)
+++ armagetronad/trunk/armagetronad/src/network/nKrawall.cpp	2009-02-25 12:14:21 UTC (rev 9045)
@@ -312,7 +312,7 @@
 {
 }
 
-static void sn_WriteHexByte( std::ostream & s, int c )
+static void sn_WriteHexByte( std::ostream & s, unsigned int c )
 {
     // don't want to rely on filling type iomanip things, never learned how to use them reliably
     s << std::hex <<  std::setfill('0') << std::setw(2) << c;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.