Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ee42621

Browse files
committed
Fix GH-11300: license issue: restricted unicode license headers
Closes GH-11572.
1 parent 928fc68 commit ee42621

File tree

6 files changed

+155
-115
lines changed

6 files changed

+155
-115
lines changed

‎NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ PHP NEWS
2121
- FTP:
2222
. Fix context option check for "overwrite". (JonasQuinten)
2323

24+
- MBString:
25+
. Fix GH-11300 (license issue: restricted unicode license headers).
26+
(nielsdos)
27+
2428
- PCNTL:
2529
. Fixed bug GH-11498 (SIGCHLD is not always returned from proc_open).
2630
(nielsdos)

‎ext/mbstring/tests/data/BIG5.txt‎

Lines changed: 58 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
1+
# BIG5.TXT
2+
# Date: 2015年12月02日 23:52:00 GMT [KW]
3+
# © 2015 Unicode®, Inc.
4+
# For terms of use, see http://www.unicode.org/terms_of_use.html
15
#
26
# Name: BIG5 to Unicode table (complete)
37
# Unicode version: 1.1
4-
# Table version: 0.0d3
8+
# Table version: 2.0
59
# Table format: Format A
6-
# Date: 11 February 1994
7-
# Authors: Glenn Adams <glenn@metis.com>
8-
# John H. Jenkins <John_Jenkins@taligent.com>
9-
#
10-
# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
11-
#
12-
# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
13-
# No claims are made as to fitness for any particular purpose. No
14-
# warranties of any kind are expressed or implied. The recipient
15-
# agrees to determine applicability of information provided. If this
16-
# file has been provided on magnetic media by Unicode, Inc., the sole
17-
# remedy for any claim will be exchange of defective media within 90
18-
# days of receipt.
19-
#
20-
# Recipient is granted the right to make copies in any form for
21-
# internal distribution and to freely use the information supplied
22-
# in the creation of products supporting Unicode. Unicode, Inc.
23-
# specifically excludes the right to re-distribute this file directly
24-
# to third parties or other organizations whether for profit or not.
10+
# Date: 2011 October 14 (header updated: 2015 December 02)
2511
#
2612
# General notes:
2713
#
28-
# This table contains the data Metis and Taligent currently have on how
29-
# BIG5 characters map into Unicode.
14+
#
15+
# This table contains one set of mappings from BIG5 into Unicode.
16+
# Note that these data are *possible* mappings only and may not be the
17+
# same as those used by actual products, nor may they be the best suited
18+
# for all uses. For more information on the mappings between various code
19+
# pages incorporating the repertoire of BIG5 and Unicode, consult the
20+
# VENDORS mapping data.
3021
#
3122
# WARNING! It is currently impossible to provide round-trip compatibility
32-
# between BIG5 and Unicode.
23+
# between BIG5 and Unicode.
3324
#
3425
# A number of characters are not currently mapped because
3526
# of conflicts with other mappings. They are as follows:
@@ -46,45 +37,58 @@
4637
#
4738
# We currently map all of these characters to U+FFFD REPLACEMENT CHARACTER.
4839
# It is also possible to map these characters to their duplicates, or to
49-
# the user zone.
50-
#
40+
# the user zone.
41+
#
5142
# Notes:
5243
#
5344
# 1. In addition to the above, there is some uncertainty about the
5445
# mappings in the range C6A1 - C8FE, and F9DD - F9FE. The ETEN
55-
# version of BIG5 organizes the former range differently, and adds
56-
# additional characters in the latter range. The correct mappings
57-
# these ranges need to be determined.
46+
# version of BIG5 organizes the former range differently, and adds
47+
# additional characters in the latter range. The correct mappings
48+
# these ranges need to be determined.
5849
#
5950
# 2. There is an uncertainty in the mapping of the Big Five character
60-
# 0xA3BC. This character occurs within the Big Five block of tone marks
61-
# for bopomofo and is intended to be the tone mark for the first tone in
62-
# Mandarin Chinese. We have selected the mapping U+02C9 MODIFIER LETTER
63-
# MACRON (Mandarin Chinese first tone) to reflect this semantic.
64-
# However, because bopomofo uses the absense of a tone mark to indicate
65-
# the first Mandarin tone, most implementations of Big Five represent
66-
# this character with a blank space, and so a mapping such as U+2003 EM SPACE
67-
# might be preferred.
68-
#
69-
#
51+
# 0xA3BC. This character occurs within the Big Five block of tone marks
52+
# for bopomofo and is intended to be the tone mark for the first tone in
53+
# Mandarin Chinese. We have selected the mapping U+02C9 MODIFIER LETTER
54+
# MACRON (Mandarin Chinese first tone) to reflect this semantic.
55+
# However, because bopomofo uses the absense of a tone mark to indicate
56+
# the first Mandarin tone, most implementations of Big Five represent
57+
# this character with a blank space, and so a mapping such as U+2003 EM
58+
# SPACE might be preferred.
7059
#
7160
# Format: Three tab-separated columns
7261
# Column #1 is the BIG5 code (in hex as 0xXXXX)
7362
# Column #2 is the Unicode (in hex as 0xXXXX)
7463
# Column #3 is the Unicode name (follows a comment sign, '#')
75-
# The official names for Unicode characters U+4E00
76-
# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
77-
# where XXXX is the code point. Including all these
78-
# names in this file increases its size substantially
79-
# and needlessly. The token "<CJK>" is used for the
80-
# name of these characters. If necessary, it can be
81-
# expanded algorithmically by a parser or editor.
64+
# The official names for Unicode characters U+4E00
65+
# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
66+
# where XXXX is the code point. Including all these
67+
# names in this file increases its size substantially
68+
# and needlessly. The token "<CJK>" is used for the
69+
# name of these characters. If necessary, it can be
70+
# expanded algorithmically by a parser or editor.
8271
#
8372
# The entries are in BIG5 order
8473
#
85-
# Any comments or problems, contact <John_Jenkins@taligent.com>
74+
# Revision History:
75+
#
76+
# [v2.0, 2015 December 02]
77+
# updates to copyright notice and terms of use
78+
# no changes to character mappings
79+
#
80+
# [v1.0, 2011 October 14]
81+
# Updated terms of use to current wording.
82+
# Updated contact information.
83+
# No changes to the mapping data.
84+
#
85+
# [v0.0d3, 11 February 1994]
86+
# First release.
8687
#
88+
# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
89+
# for any questions or comments or to report errors in the data.
8790
#
91+
# Manually added mapping of lower ASCII characters
8892
0x0 0x0
8993
0x1 0x1
9094
0x2 0x2
@@ -239,6 +243,7 @@
239243
0xA157 0xFE31 # PRESENTATION FORM FOR VERTICAL EM DASH
240244
0xA158 0x2014 # EM DASH
241245
0xA159 0xFE33 # PRESENTATION FORM FOR VERTICAL LOW LINE
246+
0xA15A 0xFFFD # *** NO MAPPING ***
242247
0xA15B 0xFE34 # PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
243248
0xA15C 0xFE4F # WAVY LOW LINE
244249
0xA15D 0xFF08 # FULLWIDTH LEFT PARENTHESIS
@@ -309,7 +314,9 @@
309314
0xA1C0 0x32A3 # CIRCLED IDEOGRAPH CORRECT
310315
0xA1C1 0x2105 # CARE OF
311316
0xA1C2 0x203E # OVERLINE
317+
0xA1C3 0xFFFD # *** NO MAPPING ***
312318
0xA1C4 0xFF3F # FULLWIDTH LOW LINE
319+
0xA1C5 0xFFFD # *** NO MAPPING ***
313320
0xA1C6 0xFE49 # DASHED OVERLINE
314321
0xA1C7 0xFE4A # CENTRELINE OVERLINE
315322
0xA1C8 0xFE4D # DASHED LOW LINE
@@ -366,6 +373,8 @@
366373
0xA1FB 0x2198 # SOUTH EAST ARROW
367374
0xA1FC 0x2225 # PARALLEL TO
368375
0xA1FD 0x2223 # DIVIDES
376+
0xA1FE 0xFFFD # *** NO MAPPING ***
377+
0xA240 0xFFFD # *** NO MAPPING ***
369378
0xA241 0xFF0F # FULLWIDTH SOLIDUS
370379
0xA242 0xFF3C # FULLWIDTH REVERSE SOLIDUS
371380
0xA243 0xFF04 # FULLWIDTH DOLLAR SIGN
@@ -471,7 +480,9 @@
471480
0xA2C9 0x3027 # HANGZHOU NUMERAL SEVEN
472481
0xA2CA 0x3028 # HANGZHOU NUMERAL EIGHT
473482
0xA2CB 0x3029 # HANGZHOU NUMERAL NINE
483+
0xA2CC 0xFFFD # *** NO MAPPING ***
474484
0xA2CD 0x5344 # <CJK>
485+
0xA2CE 0xFFFD # *** NO MAPPING ***
475486
0xA2CF 0xFF21 # FULLWIDTH LATIN CAPITAL LETTER A
476487
0xA2D0 0xFF22 # FULLWIDTH LATIN CAPITAL LETTER B
477488
0xA2D1 0xFF23 # FULLWIDTH LATIN CAPITAL LETTER C
@@ -13916,7 +13927,7 @@
1391613927
0xF9D3 0x9F7E # <CJK>
1391713928
0xF9D4 0x9F49 # <CJK>
1391813929
0xF9D5 0x9F98 # <CJK>
13919-
# The following ETEN extensions are copied from CP950.txt:
13930+
# The following ETEN extensions are copied from CP950.txt (https://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT):
1392013931
0xF9D6 0x7881 #CJK UNIFIED IDEOGRAPH
1392113932
0xF9D7 0x92B9 #CJK UNIFIED IDEOGRAPH
1392213933
0xF9D8 0x88CF #CJK UNIFIED IDEOGRAPH

‎ext/mbstring/tests/data/JISX0201.txt‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
1+
# JIS0201.TXT
2+
# Date: 2015年12月02日 23:49:00 GMT [KW]
3+
# © 2015 Unicode®, Inc.
4+
# For terms of use, see http://www.unicode.org/terms_of_use.html
15
#
26
# Name: JIS X 0201 (1976) to Unicode 1.1 Table
37
# Unicode version: 1.1
4-
# Table version: 0.9
8+
# Table version: 2.0
59
# Table format: Format A
6-
# Date: 8 March 1994
7-
# Authors: Glenn Adams <glenn@metis.com>
8-
# John H. Jenkins <John_Jenkins@taligent.com>
10+
# Date: 2011 October 14 (header updated: 2015 December 02)
911
#
10-
# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
11-
#
12-
# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
13-
# No claims are made as to fitness for any particular purpose. No
14-
# warranties of any kind are expressed or implied. The recipient
15-
# agrees to determine applicability of information provided. If this
16-
# file has been provided on magnetic media by Unicode, Inc., the sole
17-
# remedy for any claim will be exchange of defective media within 90
18-
# days of receipt.
12+
# General notes:
1913
#
20-
# Recipient is granted the right to make copies in any form for
21-
# internal distribution and to freely use the information supplied
22-
# in the creation of products supporting Unicode. Unicode, Inc.
23-
# specifically excludes the right to re-distribute this file directly
24-
# to third parties or other organizations whether for profit or not.
2514
#
26-
# General notes:
15+
# This table contains one set of mappings from JIS X 0201 into Unicode.
16+
# Note that these data are *possible* mappings only and may not be the
17+
# same as those used by actual products, nor may they be the best suited
18+
# for all uses. For more information on the mappings between various code
19+
# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
20+
# VENDORS mapping data.
2721
#
28-
# This table contains the data the Unicode Consortium has on how
29-
# single-byte JIS X 0201 characters map into Unicode 1.1
30-
# (ISO/IEC 10646:1-1993 UCS-2).
3122
#
3223
# Format: Three tab-separated columns
3324
# Column #1 is the shift JIS code (in hex as 0xXX)
@@ -36,11 +27,22 @@
3627
#
3728
# The entries are in JIS order
3829
#
39-
# These mappings are provisional, pending definition of
40-
# official mappings by Japanese standards bodies.
30+
# Revision History:
31+
#
32+
# [v2.0, 2015 December 02]
33+
# updates to copyright notice and terms of use
34+
# no changes to character mappings
35+
#
36+
# [v1.0, 2011 October 14]
37+
# Updated terms of use to current wording.
38+
# Updated contact information.
39+
# No changes to the mapping data.
4140
#
42-
# Any comments or problems, contact <John_Jenkins@taligent.com>
41+
# [v0.9, 8 March 1994]
42+
# First release.
4343
#
44+
# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
45+
# for any questions or comments or to report errors in the data.
4446
#
4547
0x20 0x0020 # SPACE
4648
0x21 0x0021 # EXCLAMATION MARK

‎ext/mbstring/tests/data/JISX0212.txt‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,36 @@
1+
# JIS0212.TXT
2+
# Date: 2015年12月02日 23:51:00 GMT [KW]
3+
# © 2015 Unicode®, Inc.
4+
# For terms of use, see http://www.unicode.org/terms_of_use.html
15
#
26
# Name: JIS X 0212 (1990) to Unicode
37
# Unicode version: 1.1
4-
# Table version: 0.9
8+
# Table version: 2.0
59
# Table format: Format A
6-
# Date: 8 March 1994
7-
# Authors: Glenn Adams <glenn@metis.com>
8-
# John H. Jenkins <John_Jenkins@taligent.com>
10+
# Date: 2011 October 14 (header updated: 2015 December 02)
911
#
10-
# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
11-
#
12-
# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
13-
# No claims are made as to fitness for any particular purpose. No
14-
# warranties of any kind are expressed or implied. The recipient
15-
# agrees to determine applicability of information provided. If this
16-
# file has been provided on magnetic media by Unicode, Inc., the sole
17-
# remedy for any claim will be exchange of defective media within 90
18-
# days of receipt.
12+
# General notes:
1913
#
20-
# Recipient is granted the right to make copies in any form for
21-
# internal distribution and to freely use the information supplied
22-
# in the creation of products supporting Unicode. Unicode, Inc.
23-
# specifically excludes the right to re-distribute this file directly
24-
# to third parties or other organizations whether for profit or not.
2514
#
26-
# General notes:
15+
# This table contains one set of mappings from JIS X 0212 into Unicode.
16+
# Note that these data are *possible* mappings only and may not be the
17+
# same as those used by actual products, nor may they be the best suited
18+
# for all uses. For more information on the mappings between various code
19+
# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
20+
# VENDORS mapping data.
2721
#
28-
# This table contains the data the Unicode Consortium has on how
29-
# JIS X 0212 (1983) characters map into Unicode.
3022
#
3123
# Format: Three tab-separated columns
3224
# Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
3325
# Column #2 is the Unicode (in hex as 0xXXXX)
3426
# Column #3 the Unicode name (follows a comment sign, '#')
35-
# The official names for Unicode characters U+4E00
36-
# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
37-
# where XXXX is the code point. Including all these
38-
# names in this file increases its size substantially
39-
# and needlessly. The token "<CJK>" is used for the
40-
# name of these characters. If necessary, it can be
41-
# expanded algorithmically by a parser or editor.
27+
# The official names for Unicode characters U+4E00
28+
# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
29+
# where XXXX is the code point. Including all these
30+
# names in this file increases its size substantially
31+
# and needlessly. The token "<CJK>" is used for the
32+
# name of these characters. If necessary, it can be
33+
# expanded algorithmically by a parser or editor.
4234
#
4335
# The entries are in JIS X 0212 order
4436
#
@@ -51,17 +43,11 @@
5143
# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
5244
# 0x6D63 -> 0x4D43 -> 7767
5345
#
54-
# The kanji mappings are a normative part of ISO/IEC 10646. The
55-
# non-kanji mappings are provisional, pending definition of
56-
# official mappings by Japanese standards bodies
57-
#
58-
# Any comments or problems, contact <John_Jenkins@taligent.com>
59-
#
6046
# Notes:
6147
#
6248
# 1. JIS X 0212 apparently unified the following two symbols
6349
# into a single character at 0x2922:
64-
#
50+
#
6551
# LATIN CAPITAL LETTER D WITH STROKE
6652
# LATIN CAPITAL LETTER ETH
6753
#
@@ -72,6 +58,23 @@
7258
# Consequently, in the Unicode mapping, 0x2922 is treated as
7359
# LATIN CAPITAL LETTER D WITH STROKE.
7460
#
61+
# Revision History:
62+
#
63+
# [v2.0, 2015 December 02]
64+
# updates to copyright notice and terms of use
65+
# no changes to character mappings
66+
#
67+
# [v1.0, 2011 October 14]
68+
# Updated terms of use to current wording.
69+
# Updated contact information.
70+
# No changes to the mapping data.
71+
#
72+
# [v0.9, 8 March 1994]
73+
# First release.
74+
#
75+
# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
76+
# for any questions or comments or to report errors in the data.
77+
#
7578
0x222F 0x02D8 # BREVE
7679
0x2230 0x02C7 # CARON (Mandarin Chinese third tone)
7780
0x2231 0x00B8 # CEDILLA

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /