diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 16:03:45 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 16:03:45 +0000 |
| commit | 99ec176a5de2bff2fe0e5f83c6ed5b92e6062abf (patch) | |
| tree | c53030e67d0d75cf696013c396fe5b57bbe76809 | |
| parent | 8a27a7dd61d92641daa481899fdaea7ec48ed77e (diff) | |
| download | brdo-99ec176a5de2bff2fe0e5f83c6ed5b92e6062abf.tar.gz brdo-99ec176a5de2bff2fe0e5f83c6ed5b92e6062abf.tar.bz2 | |
#813492 follow-up by chx, marcingy, c960657: Fixed HTTPS sessions use an invalid merge query.
| -rw-r--r-- | includes/update.inc | 4 | ||||
| -rw-r--r-- | modules/system/system.install | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/includes/update.inc b/includes/update.inc index 13c85635c..d351dcde0 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -582,6 +582,10 @@ function update_fix_d7_requirements() { variable_set('maintenance_mode_message', $message); } + // Add ssid column and index. + db_add_field('sessions', 'ssid', array('description' => "Secure session ID. The value is generated by PHP's Session API.", 'type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => '')); + db_add_index('sessions', 'ssid', array('ssid')); + variable_set('update_d7_requirements', TRUE); } diff --git a/modules/system/system.install b/modules/system/system.install index 6c44e0c43..434787605 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1414,14 +1414,14 @@ function system_schema() { 'not null' => TRUE, ), 'sid' => array( - 'description' => "Primary key: A session ID. The value is generated by PHP's Session API.", + 'description' => "A session ID. The value is generated by PHP's Session API.", 'type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => '', ), 'ssid' => array( - 'description' => "Unique key: Secure session ID. The value is generated by PHP's Session API.", + 'description' => "Secure session ID. The value is generated by PHP's Session API.", 'type' => 'varchar', 'length' => 64, 'not null' => TRUE, @@ -1460,6 +1460,7 @@ function system_schema() { 'indexes' => array( 'timestamp' => array('timestamp'), 'uid' => array('uid'), + 'ssid' => array('ssid'), ), 'foreign keys' => array( 'uid' => array('users' => 'uid'), |