Separate user agent strings for curl and fopen.

Jippe Holwerda · Jippe Holwerda · commit 4b313b69c8b9 · 2015-02-16T10:17:37.000+01:00
diff --git a/src/class-tiny-compress-curl.php b/src/class-tiny-compress-curl.php
@@ -29,7 +29,7 @@ protected function shrink_options($input) {
               CURLOPT_HEADER => true,
               CURLOPT_CAINFO => self::get_ca_file(),
               CURLOPT_SSL_VERIFYPEER => true,
-              CURLOPT_USERAGENT => Tiny_WP_Base::plugin_identification()
+              CURLOPT_USERAGENT => Tiny_WP_Base::plugin_identification() . ' cURL'
         );
     }
 
diff --git a/src/class-tiny-compress-fopen.php b/src/class-tiny-compress-fopen.php
@@ -26,7 +26,7 @@ protected function shrink_options($input) {
                 'header' => array(
                     'Content-type: image/png',
                     'Authorization: Basic ' . base64_encode('api:' . $this->api_key),
-                    'User-Agent: ' . Tiny_WP_Base::plugin_identification(),
+                    'User-Agent: ' . Tiny_WP_Base::plugin_identification() . ' fopen',
                  ),
                 'content' => $input
             ),
diff --git a/src/class-tiny-wp-base.php b/src/class-tiny-wp-base.php
@@ -27,7 +27,7 @@ public static function plugin_version() {
     }
 
     public static function plugin_identification() {
-        return 'Wordpress/' . $GLOBALS['wp_version'] . ' Tiny/' . self::plugin_version() . ' cURL';
+        return 'Wordpress/' . $GLOBALS['wp_version'] . ' Tiny/' . self::plugin_version();
     }
 
     protected static function translate($phrase) {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected function shrink_options($input) {`
`29`	`29`	`CURLOPT_HEADER => true,`
`30`	`30`	`CURLOPT_CAINFO => self::get_ca_file(),`
`31`	`31`	`CURLOPT_SSL_VERIFYPEER => true,`
`32`		`- CURLOPT_USERAGENT => Tiny_WP_Base::plugin_identification()`
	`32`	`+ CURLOPT_USERAGENT => Tiny_WP_Base::plugin_identification() . ' cURL'`
`33`	`33`	`);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static function plugin_version() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public static function plugin_identification() {`
`30`		`- return 'Wordpress/' . $GLOBALS['wp_version'] . ' Tiny/' . self::plugin_version() . ' cURL';`
	`30`	`+ return 'Wordpress/' . $GLOBALS['wp_version'] . ' Tiny/' . self::plugin_version();`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`protected static function translate($phrase) {`