@@ -78,13 +78,6 @@ class Session {
78
78
*/
79
79
public static $ time = false ;
80
80
81
- /**
82
- * Cookie lifetime
83
- *
84
- * @var integer
85
- */
86
- public static $ cookieLifeTime ;
87
-
88
81
/**
89
82
* Time when this session becomes invalid.
90
83
*
@@ -106,21 +99,14 @@ class Session {
106
99
*/
107
100
public static $ host = null ;
108
101
109
- /**
110
- * Session timeout multiplier factor
111
- *
112
- * @var integer
113
- */
114
- public static $ timeout = null ;
115
-
116
102
/**
117
103
* Number of requests that can occur during a session time without the session being renewed.
118
104
* This feature is only used when config value `Session.autoRegenerate` is set to true.
119
105
*
120
106
* @var integer
121
107
* @see Cake\Network\Session::_checkValid()
122
108
*/
123
- public static $ requestCountdown = 10 ;
109
+ protected static $ _requestCountdown = 10 ;
124
110
125
111
/**
126
112
* Pseudo constructor.
@@ -629,9 +615,14 @@ protected static function _checkValid() {
629
615
static ::$ valid = false ;
630
616
return false ;
631
617
}
632
- if ($ config = static ::read ('Config ' )) {
633
- $ sessionConfig = Configure::read ('Session ' );
634
618
619
+ $ sessionConfig = Configure::read ('Session ' );
620
+ $ requestCountdown = static ::$ _requestCountdown ;
621
+ if (isset ($ sessionConfig ['requestCountdown ' ])) {
622
+ $ requestCountdown = $ sessionConfig ['requestCountdown ' ];
623
+ }
624
+
625
+ if ($ config = static ::read ('Config ' )) {
635
626
if (static ::_validAgentAndTime ()) {
636
627
static ::write ('Config.time ' , static ::$ sessionTime );
637
628
if (isset ($ sessionConfig ['autoRegenerate ' ]) && $ sessionConfig ['autoRegenerate ' ] === true ) {
@@ -641,7 +632,7 @@ protected static function _checkValid() {
641
632
642
633
if ($ check < 1 ) {
643
634
static ::renew ();
644
- static ::write ('Config.countdown ' , static :: $ requestCountdown );
635
+ static ::write ('Config.countdown ' , $ requestCountdown );
645
636
}
646
637
}
647
638
static ::$ valid = true ;
@@ -653,7 +644,7 @@ protected static function _checkValid() {
653
644
} else {
654
645
static ::write ('Config.userAgent ' , static ::$ _userAgent );
655
646
static ::write ('Config.time ' , static ::$ sessionTime );
656
- static ::write ('Config.countdown ' , static :: $ requestCountdown );
647
+ static ::write ('Config.countdown ' , $ requestCountdown );
657
648
static ::$ valid = true ;
658
649
}
659
650
}
0 commit comments