Avoid hex2bin for PHP 5.3 #895

Alkarex · 2015-07-10T20:15:20Z

#894
And use native hexadecimal function when available (MySQL) to avoid
having binary data in the SQL logs.

FreshRSS#894 And use native hexadecimal function when available (MySQL) to avoid having binary data in the SQL logs.

Alkarex · 2015-07-10T20:17:59Z

app/Models/EntryDAO.php

@@ -77,7 +83,7 @@ public function addEntry($valuesTmp) {
 			substr($valuesTmp['link'], 0, 1023),
 			$valuesTmp['date'],
 			time(),
-			hex2bin($valuesTmp['hash']),	// X'09AF' hexadecimal literals do not work with SQLite/PDO
+			$this->hasNativeHex() ? $valuesTmp['hash'] : pack('H*', $valuesTmp['hash']),	// X'09AF' hexadecimal literals do not work with SQLite/PDO	//hex2bin() is PHP5.4+


I did not like using hex2bin() with MySQL anyway, because having binary data in the SQL logs was not nice, sometimes interfering with my SSH client.

FreshRSS#894

FreshRSS#894 FreshRSS@0cabd1f FreshRSS#789 (comment)

marienfressinaud · 2015-07-12T13:28:14Z

constants.php

@@ -25,4 +25,4 @@
 	define('APP_PATH', FRESHRSS_PATH . '/app');
 	define('EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions');

-define('TMP_PATH', sys_get_temp_dir());
+define('TMP_PATH', sys_get_temp_dir());	//Requires PHP 5.2.1+


I don't think we need this comment...

Removed Alkarex@d9d9801

marienfressinaud · 2015-07-12T13:41:00Z

I think I'm ok with that but don't we need to unpack the value somewhere?

sys_get_temp_dir() requires PHP 5.2.1+

Alkarex · 2015-07-12T14:00:30Z

@marienfressinaud I am not sure to understand your comment. If you say we should use an intermediate variable, I do not think there is a great advantage in doing so: the return value is used only once, and it is only a simple kind of string formatting / serialization (just like hex2bin()). Furthermore, it would be a (tiny bit) more work for PHP with an extra variable.
But I do not really mind.

Ahh, now I understand :-) The unpack is done natively in the SQL requests with hex(hash), e.g.
https://github.com/Alkarex/FreshRSS/blob/96b720b03269826ea0a6d58d8aea8ebf7ce7c1d9/app/Models/EntryDAO.php#L605

marienfressinaud · 2015-07-12T14:10:31Z

👍 perfect!

Avoid hex2bin for PHP 5.3

Avoid hex2bin for PHP 5.3

6b7d946

FreshRSS#894 And use native hexadecimal function when available (MySQL) to avoid having binary data in the SQL logs.

Alkarex added this to the 1.1.2 milestone Jul 10, 2015

Alkarex assigned marienfressinaud Jul 10, 2015

Alkarex reviewed Jul 10, 2015
View reviewed changes

Alkarex mentioned this pull request Jul 10, 2015

hex2bin() not available with PHP < 5.4 #894

Closed

Alkarex added 2 commits July 10, 2015 23:15

Changelog compatibility PHP5.2

1cf466c

FreshRSS#894

Changelog with more precise version PHP 5.2.1

96b720b

FreshRSS#894 FreshRSS@0cabd1f FreshRSS#789 (comment)

marienfressinaud reviewed Jul 12, 2015
View reviewed changes

Remove superfluous comment

d9d9801

sys_get_temp_dir() requires PHP 5.2.1+

marienfressinaud added a commit that referenced this pull request Jul 12, 2015

Merge pull request #895 from Alkarex/hex2bin

10deab0

Avoid hex2bin for PHP 5.3

marienfressinaud merged commit 10deab0 into FreshRSS:dev Jul 12, 2015

Alkarex deleted the hex2bin branch July 12, 2015 14:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid hex2bin for PHP 5.3 #895

Avoid hex2bin for PHP 5.3 #895

Alkarex commented Jul 10, 2015

Alkarex Jul 10, 2015

marienfressinaud Jul 12, 2015

Alkarex Jul 12, 2015

marienfressinaud commented Jul 12, 2015

Alkarex commented Jul 12, 2015

marienfressinaud commented Jul 12, 2015

Avoid hex2bin for PHP 5.3 #895

Avoid hex2bin for PHP 5.3 #895

Conversation

Alkarex commented Jul 10, 2015

Alkarex Jul 10, 2015

Choose a reason for hiding this comment

marienfressinaud Jul 12, 2015

Choose a reason for hiding this comment

Alkarex Jul 12, 2015

Choose a reason for hiding this comment

marienfressinaud commented Jul 12, 2015

Alkarex commented Jul 12, 2015

marienfressinaud commented Jul 12, 2015