From 6f61ba46c4a7d61c8e90252897b711573bbb36cc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 6 Feb 2014 23:03:05 +0400
Subject: [PATCH] detect php cgi binary because people keep trying to run
service scripts using it
---
update.php | 7 +++++++
update_daemon2.php | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/update.php b/update.php
index c1547fa7f..521b956ad 100755
--- a/update.php
+++ b/update.php
@@ -42,6 +42,13 @@
$options = getopt("", $longopts);
+ if (!is_array($options)) {
+ die("error: getopt() failed. ".
+ "Most probably you are using PHP CGI to run this script ".
+ "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+ "additional information.\n");
+ }
+
if (count($options) == 0 && !defined('STDIN')) {
?> <html>
<head>
diff --git a/update_daemon2.php b/update_daemon2.php
index 81734bc3c..9b8a7ad66 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -29,6 +29,13 @@
die("error: This script requires PHP compiled with PCNTL module.\n");
}
+ if (!is_array($options)) {
+ die("error: getopt() failed. ".
+ "Most probably you are using PHP CGI to run this script ".
+ "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+ "additional information.\n");
+ }
+
$master_handlers_installed = false;
$children = array();
--
GitLab