]>
Commit | Line | Data |
---|---|---|
af1f8920 ER |
1 | --- eventum-1.7.1/misc/scm/process_cvs_commits.php 2006-06-19 15:32:19.384637639 +0300 |
2 | +++ eventum-1.7.1/misc/scm/process_cvs_commits.php 2006-06-19 15:31:00.742910000 +0300 | |
3 | @@ -35,6 +35,21 @@ | |
4 | // DO NOT CHANGE ANYTHING AFTER THIS LINE | |
5 | // | |
6 | ||
7 | +if (isset($eventum_url)) { | |
8 | + $data = parse_url($eventum_url); | |
9 | +} else { | |
10 | + // legacy | |
11 | + $data = array(); | |
12 | + $data['host'] = $eventum_domain; | |
13 | + $data['path'] = $eventum_relative_url; | |
14 | + $data['port'] = $eventum_port; | |
15 | + $data['scheme'] = 'http'; | |
16 | +} | |
17 | + | |
18 | +if (!isset($data['port'])) { | |
19 | + $data['port'] = $data['scheme'] == 'https' ? 443 : 80; | |
20 | +} | |
21 | + | |
22 | if (isset($_SERVER)) { | |
23 | $HTTP_SERVER_VARS = $_SERVER; | |
24 | } | |
25 | @@ -76,7 +91,7 @@ | |
26 | $username = rawurlencode($username); | |
27 | ||
28 | // build the GET url to use | |
29 | - $ping_url = $eventum_relative_url . "scm_ping.php?module=$cvs_module&username=$username&commit_msg=$commit_msg"; | |
30 | + $ping_url = $data['path']. "scm_ping.php?module=$cvs_module&username=$username&commit_msg=$commit_msg"; | |
31 | foreach ($matches[1] as $issue_id) { | |
32 | $ping_url .= "&issue[]=$issue_id"; | |
33 | } | |
34 | @@ -87,13 +102,16 @@ | |
35 | $ping_url .= "&new_versions[$i]=" . rawurlencode($modified_files[$i]['new_revision']); | |
36 | } | |
37 | ||
38 | - $fp = fsockopen($eventum_domain, $eventum_port, $errno, $errstr, 30); | |
39 | + $address = $data['host']; | |
40 | + if ($data['scheme'] == 'https') { | |
41 | + $address = "ssl://$address"; | |
42 | + } | |
43 | + $fp = fsockopen($address, $data['port'], $errno, $errstr, 30); | |
44 | if (!$fp) { | |
45 | - echo "Error: Could not ping the Eventum SCM handler script.\n"; | |
46 | - exit(); | |
47 | + die("Error: Could not ping the Eventum SCM handler script.\n"); | |
48 | } else { | |
49 | $msg = "GET $ping_url HTTP/1.1\r\n"; | |
50 | - $msg .= "Host: $eventum_domain\r\n"; | |
51 | + $msg .= "Host: $data[host]\r\n"; | |
52 | $msg .= "Connection: Close\r\n\r\n"; | |
53 | fwrite($fp, $msg); | |
54 | $buf = fgets($fp, 4096); |