symfony
diff --git a/‎src/Symfony/Component/DomCrawler/Crawler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Crawler.php
+12-2Lines changed: 12 additions & 2 deletions b/‎src/Symfony/Component/DomCrawler/Crawler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Crawler.php
+12-2Lines changed: 12 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+12Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+12Lines changed: 12 additions & 0 deletions
@@ -147,8 +147,18 @@ public function addHtmlContent($content, $charset = 'UTF-8')
         $dom = new \DOMDocument('1.0', $charset);
         $dom->validateOnParse = true;
 
-        if (function_exists('mb_convert_encoding') && in_array(strtolower($charset), array_map('strtolower', mb_list_encodings()))) {
-            $content = mb_convert_encoding($content, 'HTML-ENTITIES', $charset);
+        if (function_exists('mb_convert_encoding')) {
+            $hasError = false;
+            set_error_handler(function () use (&$hasError) {
+                $hasError = true;
+            });
+            $tmpContent = @mb_convert_encoding($content, 'HTML-ENTITIES', $charset);
+
+            restore_error_handler();
+
+            if (!$hasError) {
+                $content = $tmpContent;
+            }
         }
 
         @$dom->loadHTML($content);
 
@@ -112,6 +112,18 @@ public function testAddHtmlContentUnsupportedCharset()
         $this->assertEquals('Žťčýů', $crawler->filterXPath('//p')->text());
     }
 
+    /**
+     * @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
+     */
+    public function testAddHtmlContentCharsetGbk()
+    {
+        $crawler = new Crawler();
+        //gbk encode of <html><p>中文</p></html>
+        $crawler->addHtmlContent(base64_decode('PGh0bWw+PHA+1tDOxDwvcD48L2h0bWw+'), 'gbk');
+
+        $this->assertEquals('中文', $crawler->filterXPath('//p')->text());
+    }
+
     /**
      * @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
      */