From 839b065860ae61b10061767d200b71090083f554 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 19 Sep 2012 15:54:55 +0400 Subject: [PATCH] api: remove unneeded stuff, add special header for android httpurlconnection which seems to be retarded --- api/index.php | 10 +++++----- classes/api.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/index.php b/api/index.php index f3c22be05..b74ea3c56 100644 --- a/api/index.php +++ b/api/index.php @@ -23,15 +23,12 @@ function_exists("ob_gzhandler")) { ob_start("ob_gzhandler"); + } else { + ob_start(); } $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - $session_expire = SESSION_EXPIRE_TIME; //seconds - $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid_api" : TTRSS_SESSION_NAME . "_api"; - - session_name($session_name); - $input = file_get_contents("php://input"); if (defined('_API_DEBUG_HTTP_ENABLED') && _API_DEBUG_HTTP_ENABLED) { @@ -70,4 +67,7 @@ db_close($link); + header("Api-Content-Length: " . ob_get_length()); + + ob_end_flush(); ?> diff --git a/classes/api.php b/classes/api.php index 801f99566..028cbf929 100644 --- a/classes/api.php +++ b/classes/api.php @@ -11,6 +11,7 @@ class API extends Handler { function before($method) { if (parent::before($method)) { + header("Content-Type: text/plain"); if (!$_SESSION["uid"] && $method != "login" && $method != "isloggedin") { print $this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN')); @@ -24,7 +25,6 @@ class API extends Handler { $this->seq = (int) $_REQUEST['seq']; - header("Content-Type: text/plain"); return true; } return false;