[web-bugs] master: master->main
| From: | Rasmus Lerdorf | Date: | Tue, 06 Apr 2021 04:58:15 +0000 |
| Subject: | [web-bugs] master: master->main | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-29184@lists.php.net to get a copy of this message | ||
Author: Rasmus Lerdorf (rlerdorf)
Date: 2021-04-05T21:58:19-07:00
Commit: https://github.com/php/web-bugs/commit/4f2b72f6265c74e6a26a1e2a58ae6b37d7325f5a
Raw diff: https://github.com/php/web-bugs/commit/4f2b72f6265c74e6a26a1e2a58ae6b37d7325f5a.diff
master->main
Changed paths:
M include/functions.php
M www/js/userlisting.php
Diff:
diff --git a/include/functions.php b/include/functions.php
index c46d9179..f52f5c7d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -79,7 +79,7 @@ function verify_user_password($user, $pass)
$ctx = stream_context_create(['http' => $opts]);
- $s = file_get_contents('https://master.php.net/fetch/cvsauth.php',
false, $ctx);
+ $s = file_get_contents('https://main.php.net/fetch/cvsauth.php',
false, $ctx);
$a = @unserialize($s);
if (!is_array($a)) {
diff --git a/www/js/userlisting.php b/www/js/userlisting.php
index 36c1461d..bca78504 100644
--- a/www/js/userlisting.php
+++ b/www/js/userlisting.php
@@ -9,7 +9,7 @@ function getAllUsers()
$ctx = stream_context_create(['http' => $opts]);
$token = getenv('USER_TOKEN');
- $retval = @file_get_contents('https://master.php.net/fetch/allusers.php?&token='
. rawurlencode($token), false, $ctx);
+ $retval = @file_get_contents('https://main.php.net/fetch/allusers.php?&token='
. rawurlencode($token), false, $ctx);
if (!$retval) {
return;