-add & document ini settings for exif

diff --git a/php.ini-dist b/php.ini-dist
index ec0fb08625745e24c0421dc3201821c51d28499b..97ec48f59f5272420bbdf80bd9f76cda261e355f 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -951,6 +951,19 @@ sockets.use_system_read = On
 ; dictionary files.  Include the base filename, but not the file extension.
 ; crack.default_dictionary = "c:\php\lib\cracklib_dict"
 
+[exif]
+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. 
+; With mbstring support this will automatically be converted into the encoding
+; given by corresponding encode setting. When empty mbstring.internal_encoding 
+; is used. For the decode settings you can distinguish between motorola and 
+; intel byte order. A decode setting cannot be empty.
+;exif.encode_unicode = ISO-8859-15
+;exif.decode_unicode_motorola = UCS-2BE
+;exif.decode_unicode_intel    = UCS-2LE
+;exif.encode_jis = 
+;exif.decode_jis_motorola = JIS
+;exif.decode_jis_intel    = JIS
+
 ; Local Variables:
 ; tab-width: 4
 ; End:

diff --git a/php.ini-recommended b/php.ini-recommended
index 663b8d9f7160fad095f09c19fb6a702ab93d4380..acd545906069343386335abf52e325ff92ba200c 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -958,6 +958,19 @@ sockets.use_system_read = On
 ; dictionary files.  Include the base filename, but not the file extension.
 ; crack.default_dictionary = "c:\php\lib\cracklib_dict"
 
+[exif]
+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. 
+; With mbstring support this will automatically be converted into the encoding
+; given by corresponding encode setting. When empty mbstring.internal_encoding 
+; is used. For the decode settings you can distinguish between motorola and 
+; intel byte order. A decode setting cannot be empty.
+;exif.encode_unicode = ISO-8859-15
+;exif.decode_unicode_motorola = UCS-2BE
+;exif.decode_unicode_intel    = UCS-2LE
+;exif.encode_jis = 
+;exif.decode_jis_motorola = JIS
+;exif.decode_jis_intel    = JIS
+
 ; Local Variables:
 ; tab-width: 4
 ; End: