List of commits:
Subject Hash Author Date (UTC)
Fixes for base_url: did not work for docker (bad switch to https) 4aee622d5e845a9e308f7277af1a1b612fc0c173 Catalin(ux) M. BOIE 2017-06-25 07:49:17
Fixed the commit show page (showing multiple commits) 3e932d79f05be2593cb4c62a58cc0f98704ba5d7 Catalin(ux) M. BOIE 2017-06-25 07:48:21
nginx preparations in .spec file and remove hard dependency on a web server 9aac8ca0a8cb26da4552b9e55f1d4d6b3a4a5d14 Catalin(ux) M. BOIE 2017-06-25 07:46:46
compare: added 'LDAP groups' item and 'Product distribution/evaluation' category ee0b6e752dd575ca1f2b94b7d1c9156db89e40c7 Catalin(ux) M. BOIE 2017-06-25 07:44:45
Improved the installation documentation (add added nginx) 7282afb958acad6e7a4399442b306df59a9b02c0 Catalin(ux) M. BOIE 2017-06-25 07:43:15
Docker fixes 16b1c0adb4518db3a1498c1e30d5a409b692b2bb Catalin(ux) M. BOIE 2017-06-25 07:36:09
Disabled repo 'Stats' menu because of performance issues da34324ac9972bac872916aef29d1d4e0b8f0499 Catalin(ux) M. BOIE 2017-06-09 17:50:54
Manually free memory to improve performance d6b93c1dc2aef248fba8d5f4a34e57ad3433f82f Catalin(ux) M. BOIE 2017-06-09 17:37:37
Add a random id to all requests to be able to identify them in the logs 1a487eb279fb2f77db64dbee1b2c1067b548899b Catalin(ux) M. BOIE 2017-05-29 17:09:20
Docker improvements and 'make docker' to easy testing 2171599842a90282c24845d41965ef6f7893342c Catalin(ux) M. BOIE 2017-05-28 10:09:21
Improved apache sample configuration de04d409f25a6f5d1fe304069753144c17c4f631 Catalin(ux) M. BOIE 2017-05-28 10:07:47
Use the database only after we setup the connection 26487d0f17f510d26ef182b6c0938022b0730752 Catalin(ux) M. BOIE 2017-05-25 16:39:53
Bump version to 0.68 02b4708f1cdad67a810f7f1808364774e8ac4831 Catalin(ux) M. BOIE 2017-05-25 14:33:17
Small debug of schema_ver 990ad6c4fad455a284a19ed2a60e80442c4ac9d8 Catalin(ux) M. BOIE 2017-05-25 14:32:54
TODO updates ea0e06ee96761e3220ac7a27ede1669c7501b9ba Catalin(ux) M. BOIE 2017-05-25 14:29:43
Prepare env to use base_url d6c009c120fce4df47a7651a94619142c8992d52 Catalin(ux) M. BOIE 2017-05-24 19:05:08
Use base_url function instead of the obsolete web_url variable a821ee84f3dcf7294ee569dbc2da8b442cb60f29 Catalin(ux) M. BOIE 2017-05-24 19:03:49
Declare state as loaded only if I can really save it in cache 10c2fcf9b78d6eb568e81ec34addfa2246d32618 Catalin(ux) M. BOIE 2017-05-24 18:53:25
Small texts fixes 9f7998f23276d44435bd3319099d13bcb40c6b7e Catalin(ux) M. BOIE 2017-05-24 18:51:50
Improved http tests by using persistent connections 9b77048af3f73f8bf30128d5b07a2bae28315d45 Catalin(ux) M. BOIE 2017-05-24 18:48:50
Commit 4aee622d5e845a9e308f7277af1a1b612fc0c173 - Fixes for base_url: did not work for docker (bad switch to https)
Author: Catalin(ux) M. BOIE
Author date (UTC): 2017-06-25 07:49
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2017-06-25 07:49
Parent(s): 3e932d79f05be2593cb4c62a58cc0f98704ba5d7
Signer:
Signing key:
Signing status: N
Tree: 2b5b3d915a28516e3eabb34d4d3f2a1f3223bdd1
File Lines added Lines deleted
inc/util.inc.php 8 9
root/index.php 3 8
File inc/util.inc.php changed (mode: 100644) (index e48ef9a..44ecd5c)
... ... function rg_base_url()
246 246
247 247 /* /*
248 248 * Builds a correct URL to refer to the current virtualhost * Builds a correct URL to refer to the current virtualhost
249 * @http(s)_allow: '0' if not allowed, FALSE if unknown, else port number
250 * Note: at least one of http_allow or https_allow will be set to a port number.
249 251 */ */
250 252 function rg_base_url_build($hostname, $http_allow, $https_allow) function rg_base_url_build($hostname, $http_allow, $https_allow)
251 253 { {
252 254 global $rg_base_url; global $rg_base_url;
253 255
254 256 // We are forced to use something if we cannot get them from cache/db // We are forced to use something if we cannot get them from cache/db
255 if ($hostname === FALSE)
257 if (($hostname === FALSE) || empty($hostname))
256 258 $hostname = php_uname('n'); $hostname = php_uname('n');
257 if ($http_allow === FALSE)
258 $http_allow = 80;
259 if ($https_allow === FALSE)
260 $https_allow = 443;
261 259
262 $add = '';
263 if (strcmp($https_allow, '443') != 0)
264 $add = ':' . $https_allow;
260 // Prefer httpS
261 if (intval($https_allow) > 0) {
262 $add = '';
263 if (strcmp($https_allow, '443') != 0)
264 $add = ':' . $https_allow;
265 265
266 if (strcmp($https_allow, '0') != 0) {
267 266 $rg_base_url = 'https://' . $hostname . $add; $rg_base_url = 'https://' . $hostname . $add;
268 267 return; return;
269 268 } }
File root/index.php changed (mode: 100644) (index d6d1b36..3038b86)
... ... if ($r === FALSE) {
112 112 } }
113 113
114 114 // Sets http(s)_allow and hostname // Sets http(s)_allow and hostname
115 $hostname = rg_state_get($db, 'hostname');
115 116 $http_allow = rg_state_get($db, 'http_allow'); $http_allow = rg_state_get($db, 'http_allow');
116 117 $https_allow = rg_state_get($db, 'https_allow'); $https_allow = rg_state_get($db, 'https_allow');
117 $hostname = rg_state_get($db, 'hostname');
118 118 if (isset($_SERVER['SERVER_NAME'])) { if (isset($_SERVER['SERVER_NAME'])) {
119 119 $sn = $_SERVER['SERVER_NAME']; $sn = $_SERVER['SERVER_NAME'];
120 120 $port = $_SERVER['SERVER_PORT']; $port = $_SERVER['SERVER_PORT'];
 
... ... if (isset($_SERVER['SERVER_NAME'])) {
133 133 $https_allow = $port; $https_allow = $port;
134 134 rg_state_set($db, 'https_allow', $https_allow); rg_state_set($db, 'https_allow', $https_allow);
135 135 } }
136
137 // We have https, no need for http!
138 if (($http_allow === FALSE) || (strcmp($http_allow, '') == 0))
139 $http_allow = '0';
140 136 } else { } else {
141 137 if ($http_allow === FALSE) { if ($http_allow === FALSE) {
142 138 $http_allow = $port; $http_allow = $port;
 
... ... if ($rg['login_ui']['uid'] > 0) {
264 260 } }
265 261
266 262
267 // Redirect if http is not allowed and https is and the user is not logged in
263 // Redirect if http is not allowed and the user is not logged in
268 264 if (($rg['https'] == 0) if (($rg['https'] == 0)
269 265 && ($rg['login_ui']['uid'] == 0) && ($rg['login_ui']['uid'] == 0)
270 && (strcmp($http_allow, '0') == 0)
271 && (strcmp($https_allow, '0') != 0))
266 && (strcmp($http_allow, '0') == 0))
272 267 rg_redirect(rg_base_url() . $sparas); rg_redirect(rg_base_url() . $sparas);
273 268
274 269
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/catalinux/rocketgit

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit

Clone this repository using git:
git clone git://git.rocketgit.com/user/catalinux/rocketgit

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main