Skip to content

Commit ef56c22

Browse files
kamil-tekielakamil-tekiela
committed
Deprecate disabling use_only_cookies
1 parent 0775b99 commit ef56c22

36 files changed

+129
-15
lines changed

‎ext/session/session.c

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,30 @@ static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */
808808
return SUCCESS;
809809
} /* }}} */
810810

811+
static PHP_INI_MH(OnUpdateUseOnlyCookies)
812+
{
813+
SESSION_CHECK_ACTIVE_STATE;
814+
SESSION_CHECK_OUTPUT_STATE;
815+
bool *p = (bool *) ZEND_INI_GET_ADDR();
816+
*p = zend_ini_parse_bool(new_value);
817+
if (!*p) {
818+
php_error_docref(NULL, E_DEPRECATED, "Disabling session.use_only_cookies INI setting is deprecated");
819+
}
820+
return SUCCESS;
821+
}
822+
823+
static PHP_INI_MH(OnUpdateUseTransSid)
824+
{
825+
SESSION_CHECK_ACTIVE_STATE;
826+
SESSION_CHECK_OUTPUT_STATE;
827+
bool *p = (bool *) ZEND_INI_GET_ADDR();
828+
*p = zend_ini_parse_bool(new_value);
829+
if (*p) {
830+
php_error_docref(NULL, E_DEPRECATED, "Enabling session.use_trans_sid INI setting is deprecated");
831+
}
832+
return SUCCESS;
833+
}
834+
811835
/* {{{ PHP_INI */
812836
PHP_INI_BEGIN()
813837
STD_PHP_INI_ENTRY("session.save_path", "", PHP_INI_ALL, OnUpdateSaveDir, save_path, php_ps_globals, ps_globals)
@@ -825,12 +849,12 @@ PHP_INI_BEGIN()
825849
STD_PHP_INI_BOOLEAN("session.cookie_httponly", "0", PHP_INI_ALL, OnUpdateSessionBool, cookie_httponly, php_ps_globals, ps_globals)
826850
STD_PHP_INI_ENTRY("session.cookie_samesite", "", PHP_INI_ALL, OnUpdateSessionString, cookie_samesite, php_ps_globals, ps_globals)
827851
STD_PHP_INI_BOOLEAN("session.use_cookies", "1", PHP_INI_ALL, OnUpdateSessionBool, use_cookies, php_ps_globals, ps_globals)
828-
STD_PHP_INI_BOOLEAN("session.use_only_cookies", "1", PHP_INI_ALL, OnUpdateSessionBool, use_only_cookies, php_ps_globals, ps_globals)
852+
STD_PHP_INI_BOOLEAN("session.use_only_cookies", "1", PHP_INI_ALL, OnUpdateUseOnlyCookies, use_only_cookies, php_ps_globals, ps_globals)
829853
STD_PHP_INI_BOOLEAN("session.use_strict_mode", "0", PHP_INI_ALL, OnUpdateSessionBool, use_strict_mode, php_ps_globals, ps_globals)
830854
STD_PHP_INI_ENTRY("session.referer_check", "", PHP_INI_ALL, OnUpdateSessionString, extern_referer_chk, php_ps_globals, ps_globals)
831855
STD_PHP_INI_ENTRY("session.cache_limiter", "nocache", PHP_INI_ALL, OnUpdateSessionString, cache_limiter, php_ps_globals, ps_globals)
832856
STD_PHP_INI_ENTRY("session.cache_expire", "180", PHP_INI_ALL, OnUpdateSessionLong, cache_expire, php_ps_globals, ps_globals)
833-
STD_PHP_INI_BOOLEAN("session.use_trans_sid", "0", PHP_INI_ALL, OnUpdateSessionBool, use_trans_sid, php_ps_globals, ps_globals)
857+
STD_PHP_INI_BOOLEAN("session.use_trans_sid", "0", PHP_INI_ALL, OnUpdateUseTransSid, use_trans_sid, php_ps_globals, ps_globals)
834858
PHP_INI_ENTRY("session.sid_length", "32", PHP_INI_ALL, OnUpdateSidLength)
835859
PHP_INI_ENTRY("session.sid_bits_per_character", "4", PHP_INI_ALL, OnUpdateSidBits)
836860
STD_PHP_INI_BOOLEAN("session.lazy_write", "1", PHP_INI_ALL, OnUpdateSessionBool, lazy_write, php_ps_globals, ps_globals)

‎ext/session/tests/015.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ session_start();
2626
session_destroy();
2727
?>
2828
--EXPECT--
29+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
30+
31+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
2932
<a href="/link?PHPSESSID=test015&PHPSESSID=test015">

‎ext/session/tests/018.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ session_start();
2626
session_destroy();
2727
?>
2828
--EXPECT--
29+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
30+
31+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
2932
<form accept-charset="ISO-8859-15, ISO-8859-1" action=url.php><input type="hidden" name="PHPSESSID" value="test018" />

‎ext/session/tests/020.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ session_start();
2727
session_destroy();
2828
?>
2929
--EXPECT--
30+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
31+
32+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
3033
<a href="link.php?a=b&amp;PHPSESSID=test020">

‎ext/session/tests/021.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ ini_set("url_rewriter.tags", "a=href,fieldset=,area=href,frame=src,input=src");
6060
session_destroy();
6161
?>
6262
--EXPECT--
63+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
64+
65+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
6366
<form action="//bad.net/do.php">
6467
<fieldset>
6568
<form action="//php.net/do.php"><input type="hidden" name="PHPSESSID" value="test021" />

‎ext/session/tests/bug36459.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ session_start();
3030
</body>
3131
</html>
3232
--EXPECTF--
33+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
34+
35+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
3336
<html>
3437
<head>
3538
<title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title>

‎ext/session/tests/bug41600.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ session_start();
2727
session_destroy();
2828
?>
2929
--EXPECT--
30+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
31+
32+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
3033
<a href="link.php?a=b&amp;PHPSESSID=bug41600">

‎ext/session/tests/bug42596.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@ foreach (glob($sessdir. "*") as $sessfile) {
3434
rmdir($sessdir);
3535
?>
3636
--EXPECT--
37+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
3738
hello world
3839
string(6) "100777"

‎ext/session/tests/bug50308.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ session.use_only_cookies=0
2525
<a href=./>
2626
<a href="./">
2727
--EXPECTF--
28+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
29+
30+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
2831
<a href="?PHPSESSID=%s"/>
2932
<a href="?PHPSESSID=%s" />
3033
<a href="foo?PHPSESSID=%s"/>

‎ext/session/tests/bug51338.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ session_start();
1313
print_r(ob_list_handlers());
1414
?>
1515
--EXPECT--
16+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
1617
Array
1718
(
1819
)

‎ext/session/tests/bug71683.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ ob_start();
1414
echo "ok\n";
1515
?>
1616
--EXPECT--
17+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
1718
ok

‎ext/session/tests/bug71974.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ session_start()
2121
<a href="some.php">abc</a>
2222
--EXPECT--
2323
<a href="some.php">abc</a>
24+
25+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
26+
27+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0

‎ext/session/tests/bug72940.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ session_start();
3131
var_dump(session_id(), SID);
3232
session_destroy();
3333
?>
34-
--EXPECT--
34+
--EXPECTF--
35+
Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 6
3536
string(12) "bug72940test"
3637
string(0) ""
38+
39+
Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 13
3740
string(11) "bug72940get"
3841
string(21) "PHPSESSID=bug72940get"

‎ext/session/tests/bug74892.phpt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
--TEST--
22
Bug #74892 Url Rewriting (trans_sid) not working on urls that start with #
3+
--INI--
4+
session.use_cookies=0
5+
session.use_only_cookies=0
6+
session.use_trans_sid=1
37
--EXTENSIONS--
48
session
59
--SKIPIF--
610
<?php include('skipif.inc'); ?>
711
--FILE--
812
<?php
9-
ini_set('session.use_cookies', '0');
10-
ini_set('session.use_only_cookies',0);
11-
ini_set('session.use_trans_sid',1);
12-
ini_set('session.trans_sid_hosts','php.net');
13+
ini_set('session.trans_sid_hosts','php.net'); // This value cannot be set in the INI file
1314
session_id('sessionidhere');
1415
session_start();
1516

@@ -19,6 +20,9 @@ session_start();
1920
<p><a href="http://php.net#foo">External link with anchor 2</a></p>
2021
<p><a href="#place">Internal link</a></p>
2122
--EXPECT--
23+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
24+
25+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
2226
<p><a href="index.php?PHPSESSID=sessionidhere">Click This Anchor Tag!</a></p>
2327
<p><a href="index.php?PHPSESSID=sessionidhere#place">External link with anchor</a></p>
2428
<p><a href="http://php.net?PHPSESSID=sessionidhere#foo">External link with anchor 2</a></p>

‎ext/session/tests/rfc1867.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,5 @@ array(5) {
133133
}
134134
}
135135
}
136+
137+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_cleanup.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,5 @@ array(2) {
8787
}
8888
}
8989
bool(false)
90+
91+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_disabled.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,5 @@ array(2) {
8080
}
8181
}
8282
bool(false)
83+
84+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_disabled_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,5 @@ array(2) {
8080
}
8181
}
8282
bool(false)
83+
84+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_inter.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,5 @@ array(5) {
137137
}
138138
}
139139
bool(false)
140+
141+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_no_name.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,5 @@ array(2) {
8080
}
8181
}
8282
bool(false)
83+
84+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_sid_cookie.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,5 @@ array(5) {
132132
}
133133
}
134134
}
135+
136+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_sid_get.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,5 @@ array(5) {
130130
}
131131
}
132132
}
133+
134+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_sid_get_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,5 @@ array(5) {
132132
}
133133
}
134134
}
135+
136+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_sid_invalid.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,5 @@ array(5) {
144144
}
145145
}
146146
}
147+
148+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/rfc1867_sid_post.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,5 @@ array(5) {
128128
}
129129
}
130130
}
131+
132+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0

‎ext/session/tests/session_basic3.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ var_dump(session_destroy());
222222
ob_end_flush();
223223
?>
224224
--EXPECT--
225+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
226+
227+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
225228
*** Testing basic session functionality : variation3 use_trans_sid ***
226229
*** Test trans sid ***
227230

‎ext/session/tests/session_basic4.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ echo '
4848
';
4949
?>
5050
--EXPECT--
51+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
52+
53+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
5154
*** Testing basic session functionality : variation4 use_trans_sid ***
5255
*** Test trans sid ***
5356

‎ext/session/tests/session_basic5.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@ var_dump(session_destroy());
235235
ob_end_flush();
236236
?>
237237
--EXPECT--
238+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
239+
240+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
238241
*** Testing basic session functionality : variation5 use_trans_sid ***
239242
*** Test trans sid ***
240243

‎ext/standard/tests/general_functions/bug44394_2.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ session
55
--INI--
66
session.name=PHPSESSID
77
session.use_only_cookies=0
8+
session.use_trans_sid=1
89
session.trans_sid_tags="a=href,area=href,frame=src,form="
910
url_rewriter.tags="a=href,area=href,frame=src,form="
1011
--FILE--
1112
<?php
1213

13-
ini_set('session.use_trans_sid', 1);
1414
session_save_path(__DIR__);
1515
session_start();
1616

@@ -34,4 +34,7 @@ foreach (glob(__DIR__ . '/sess_*') as $filename) {
3434
}
3535
?>
3636
--EXPECTF--
37+
Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
38+
39+
Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
3740
<a href='a?q=1&a=b&PHPSESSID=%s'>asd</a>

‎ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ Test use_trans_sid=1
7474
<form action="http://php.net/bar.php" method="get"> </form>
7575
<form action="bad://php.net/bar.php" method="get"> </form>
7676
<form action="//www.php.net/bar.php" method="get"> </form>
77-
--EXPECT--
77+
--EXPECTF--
78+
Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 6
7879
Without session
7980
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
8081
<a href="./foo.php?%3CNAME%3E=%3CVALUE%3E"> </a>
@@ -105,6 +106,8 @@ Test use_trans_sid=0
105106
<form action="bad://php.net/bar.php" method="get"> </form>
106107
<form action="//www.php.net/bar.php" method="get"><input type="hidden" name="&lt;NAME&gt;" value="&lt;VALUE&gt;" /> </form>
107108

109+
110+
Deprecated: ini_set(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 50
108111
Test use_trans_sid=1
109112
<a href="?PHPSESSID=testid&%3CNAME%3E=%3CVALUE%3E"> </a>
110113
<a href="./foo.php?PHPSESSID=testid&%3CNAME%3E=%3CVALUE%3E"> </a>

‎ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Test use_trans_sid=1
7474
<form action="http://php.net/bar.php" method="get"> </a>
7575
<form action="bad://php.net/bar.php" method="get"> </a>
7676
<form action="//www.php.net/bar.php" method="get"> </a>
77-
--EXPECT--
77+
--EXPECTF--
7878
Without session
7979
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
8080
<a href="./foo.php?%3CNAME%3E=%3CVALUE%3E"> </a>
@@ -105,6 +105,8 @@ Test use_trans_sid=0
105105
<form action="bad://php.net/bar.php" method="get"> </a>
106106
<form action="//www.php.net/bar.php" method="get"><input type="hidden" name="&lt;NAME&gt;" value="&lt;VALUE&gt;" /> </a>
107107

108+
109+
Deprecated: ini_set(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 50
108110
Test use_trans_sid=1
109111
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
110112
<a href="./foo.php?%3CNAME%3E=%3CVALUE%3E"> </a>

‎ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ Test use_trans_sid=1
7373
<form action="http://php.net/bar.php" method="get"> </a>
7474
<form action="bad://php.net/bar.php" method="get"> </a>
7575
<form action="//www.php.net/bar.php" method="get"> </a>
76-
--EXPECT--
76+
--EXPECTF--
77+
Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 5
7778
Without session
7879
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
7980
<a href="./foo.php?%3CNAME%3E=%3CVALUE%3E"> </a>
@@ -104,6 +105,8 @@ Test use_trans_sid=0
104105
<form action="bad://php.net/bar.php" method="get"> </a>
105106
<form action="//www.php.net/bar.php" method="get"> </a>
106107

108+
109+
Deprecated: ini_set(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 49
107110
Test use_trans_sid=1
108111
<a href="?PHPSESSID=testid&%3CNAME%3E=%3CVALUE%3E"> </a>
109112
<a href="./foo.php?PHPSESSID=testid&%3CNAME%3E=%3CVALUE%3E"> </a>

‎ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Test use_trans_sid=1
7373
<form action="http://php.net/bar.php" method="get"> </a>
7474
<form action="bad://php.net/bar.php" method="get"> </a>
7575
<form action="//www.php.net/bar.php" method="get"> </a>
76-
--EXPECT--
76+
--EXPECTF--
7777
Without session
7878
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
7979
<a href="./foo.php?%3CNAME%3E=%3CVALUE%3E"> </a>
@@ -104,6 +104,8 @@ Test use_trans_sid=0
104104
<form action="bad://php.net/bar.php" method="get"> </a>
105105
<form action="//www.php.net/bar.php" method="get"> </a>
106106

107+
108+
Deprecated: ini_set(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 49
107109
Test use_trans_sid=1
108110
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
109111
<a href="./foo.php?%3CNAME%3E=%3CVALUE%3E"> </a>

‎ext/standard/tests/general_functions/url_rewriting_basic1.phpt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ session_start();
7676
echo "\nURL-Rewriting with transparent session id support without output_add_rewrite_var()\n";
7777
echo $testTags;
7878

79-
--EXPECT--
79+
--EXPECTF--
8080
URL-Rewriting with output_add_rewrite_var() without transparent session id support
8181

8282
<a href="?%3Cname%3E=%3Cvalue%3E"></a>
@@ -115,6 +115,10 @@ URL-Rewriting with output_add_rewrite_var() without transparent session id suppo
115115
<form action="bad://url-rewriter.com/bar.php" method="get"></form>
116116
<form action="//www.url-rewriter.com/bar.php" method="get"></form>
117117

118+
Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 60
119+
120+
Deprecated: ini_set(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 63
121+
118122
URL-Rewriting with transparent session id support without output_add_rewrite_var()
119123

120124
<a href="?PHPSESSID=testid"></a>

0 commit comments

Comments
 (0)