Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
99ec176a
Commit
99ec176a
authored
Jun 21, 2010
by
webchick
Browse files
#813492
follow-up by chx, marcingy, c960657: Fixed HTTPS sessions use an invalid merge query.
parent
8a27a7dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
includes/update.inc
View file @
99ec176a
...
...
@@ -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
);
}
...
...
modules/system/system.install
View file @
99ec176a
...
...
@@ -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'
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment