clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,937 Commits 491 Branches 1,363 Tags 844 MiB
f62943edc8
Commit Graph

169 Commits

Author SHA1 Message Date
Stanislav Malyshev
67fbb06311 Merge branch 'PHP-5.5' into PHP-7.0.5 
* PHP-5.5:
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fix bug #71798 - Integer Overflow in php_raw_url_encode
  Fix bug #71860: Require valid paths for phar filenames
  Going for 5.5.34

Conflicts:
	configure.in
	ext/phar/phar_object.c
	ext/phar/tests/badparameters.phpt
	ext/phar/tests/create_path_error.phpt
	ext/phar/tests/pharfileinfo_construct.phpt
	ext/snmp/snmp.c
	ext/standard/url.c
	main/php_version.h
 2016-03-28 23:55:05 -07:00
Stanislav Malyshev
f8dd10508b Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut 2016-03-28 23:15:16 -07:00
Yasuo Ohgaki
7554478a4c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
 2016-01-18 10:52:11 +09:00
Yasuo Ohgaki
dc23f1f38f Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test 2016-01-18 10:51:29 +09:00
Nikita Popov
f809f28119 Check mbfl_filt_put_invalid_char return value 
And fix some libmbfl warnings
 2015-07-18 21:53:03 +02:00
Masaki Kagaya
9d81d7ff70 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:45:11 -07:00
Masaki Kagaya
934d6ed900 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:40:56 -07:00
Masaki Kagaya
fa72f1ea86 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:39:04 -07:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Sobak
00c362c1f6 Removed another cvsclean file 2014-06-08 19:28:06 -07:00
Felipe Pena
df31eb8fdc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
 2013-10-20 08:51:17 -02:00
Felipe Pena
33d377e701 - Fixed possible uninitialized scalar variable usage (spotted by Coverity) 2013-10-20 08:51:09 -02:00
Rui Hirokawa
0a974f14d1 MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:46:54 +09:00
Rui Hirokawa
c10d7e1afc MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:17:15 +09:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Xinchen Hui
3781026cb8 Comparison between pointer and integer 2011-11-21 06:07:43 +00:00
Xinchen Hui
034ba714cf Comparison between pointer and integer 2011-11-21 06:07:43 +00:00
Xinchen Hui
601407aa25 Fixed bug #60306 (Characters lost while converting from cp936 to utf8) 2011-11-18 08:50:29 +00:00
Xinchen Hui
5008390304 Fixed bug #60306 (Characters lost while converting from cp936 to utf8) 2011-11-18 08:50:29 +00:00
Pierrick Charron
89104021b7 Remove unused variables in libmbfl 2011-11-18 06:27:27 +00:00
Pierrick Charron
ced34c975e Remove unused variables in libmbfl 2011-11-18 06:27:27 +00:00
Rui Hirokawa
77477945b3 MFH: fixed alias and encoding mapping for emoji logo. 2011-11-02 14:51:56 +00:00
Rui Hirokawa
9e7cc71167 fixed alias and encoding mapping for emoji logo. 2011-11-02 14:51:39 +00:00
Rui Hirokawa
c1a4a36c14 MFH: fixed alias of encoding. 2011-10-30 08:40:51 +00:00
Rui Hirokawa
ff72c73ce9 fixed alias of encoding. 2011-10-30 08:40:22 +00:00
Rui Hirokawa
5add615494 MFH: removed invalid two byte sequenct for utf-8. 2011-10-23 11:54:34 +00:00
Rui Hirokawa
71a94c2225 removed invalid two byte sequenct for utf-8. 2011-10-23 11:54:06 +00:00
Rui Hirokawa
0d73145490 MFH: fixed byte length of utf-8. 2011-10-18 14:04:13 +00:00
Rui Hirokawa
ec2670a276 fixed byte length of utf-8. 2011-10-18 14:03:44 +00:00
Rui Hirokawa
35ec732d92 added a missing emoji U+27BF. 2011-10-15 07:14:45 +00:00
Rui Hirokawa
a1de339e17 added a missing emoji U+27BF. 2011-10-15 07:12:02 +00:00
Rui Hirokawa
3d888412da MFH: fixed #40685: removed '&' in mb_decode_numericentity(). 2011-09-24 02:20:38 +00:00
Rui Hirokawa
a6a3bd010a MFH: fixed #40685: removed '&' in mb_decode_numericentity(). 2011-09-24 02:12:17 +00:00
Rui Hirokawa
ac54ec22f5 fixed #40685: removed '&' in mb_decode_numericentity(). 2011-09-24 02:11:18 +00:00
Rui Hirokawa
d938844d8f MFH: fixed a bug in convertion table and added test script for emoji. 2011-09-23 11:11:38 +00:00
Rui Hirokawa
f178684ffb fixed a bug in conversion table. 2011-09-23 11:08:34 +00:00
Pierre Joye
5cb30970dc - unused var 2011-09-12 09:27:03 +00:00
Pierre Joye
8bab4d155c - unused var 2011-09-12 09:27:03 +00:00
Rui Hirokawa
59b9ca51b0 MFH: fixed test case failures. 2011-09-11 12:12:48 +00:00
Rui Hirokawa
01bb437b85 fixed test case failures. 2011-09-11 12:12:24 +00:00
Rui Hirokawa
0d2aa8591b MFH: fixed invalid utf-8 check. 2011-09-07 14:30:38 +00:00
Rui Hirokawa
36378d34f8 fixed invalid utf-8 check. 2011-09-07 14:30:06 +00:00