php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
106,255 Commits 549 Branches 1,485 Tags
d142dfc93d71bb387c19a06f77c265e89fc9d516
Commit Graph

192 Commits

Author SHA1 Message Date
Peter Kokot 60a69daec6 Sync leading and final newlines in source code files 
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
 2018-10-14 12:54:08 +02:00
Peter Kokot 902d39a3a7 Trim trailing whitespace in source code files 2018-10-13 14:14:50 +02:00
Nikita Popov 00c0d7702c Merge branch 'PHP-7.1' into PHP-7.2 2018-06-28 23:05:09 +02:00
Marcus Schwarz bf5a802f5a Fixed bug #76532 (excessive memory usage in mb_strimwidth) 2018-06-28 23:02:28 +02:00
Christoph M. Becker cd2912af5e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #75944: Wrong cp1251 detection
 2018-03-19 14:34:09 +01:00
Christoph M. Becker 47461368ca Fix #75944: Wrong cp1251 detection 
`\xFF` is a valid character of CP-1251.
 2018-03-19 14:24:27 +01:00
Christoph M. Becker 2b02e6dff3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #62545: wrong unicode mapping in some charsets
 2018-03-11 17:54:45 +01:00
Christoph M. Becker 01ea314e8c Fix #62545: wrong unicode mapping in some charsets 
Undefined characters are best mapped to Unicode REPLACEMENT characters.
 2018-03-11 17:38:28 +01:00
Nikita Popov fb9bf5b64b Revert/fix substitution character fallback 
The introduced checks were not correct in two respects:
 * It was checked whether the source encoding of the string matches
   the internal encoding, while the actually relevant encoding is
   the *target* encoding.
 * Even if the correct encoding is used, the checks are still too
   conservative. Just because something is not a "Unicode-encoding"
   does not mean that it does not map any non-ASCII characters.

I've reverted the added checks and instead adjusted mbfl_convert
to first try to use the provided substitution character and if
that fails, perform the fallback to '?' at that point. This means
that any codepoint mapped in the target encoding should now be
correctly supported and anything else should fall back to '?'.
 2017-08-03 21:53:59 +02:00
Nikita Popov 5d777e56e2 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-28 13:03:26 +02:00
Nikita Popov e3d25e78eb Fixed bug #62934 2017-07-28 13:02:25 +02:00
Nikita Popov 88f752a947 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-23 12:21:51 +02:00
Christoph M. Becker 418da85f15 Fix #71606: Segmentation fault mb_strcut with HTML-ENTITIES 
The HTML decoding filter uses the `opaque` member of mbfl_convert_filter
as buffer, but there was no copy constructor defined, what caused double
frees when the filter is copied (what happens multiple times in mb_strcut(),
for instance).
 2017-07-23 12:19:27 +02:00
Brian Evans 2fe9208ee3 Use modern autotools name of configure.ac instead of configure.in 
configure.ac was introduced in 2001 with automake-1.15 and autoconf-2.50
to replace the file named configure.in.
Autotools is preparing to remove configure.in in Automake 2.0.
All new software should be using configure.ac.
This also fixes Bug #69770 where extensions are creating configure.in

Signed-off-by: Brian Evans <grknight@gentoo.org>
 2017-01-27 06:07:40 +00:00
Anatol Belski 58a945cf68 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix C89 compat
 2016-12-17 20:45:22 +01:00
Anatol Belski 79e47aae41 fix C89 compat 2016-12-17 20:43:32 +01:00
Stanislav Malyshev bc85678df3 Add more mbfl string size checks (bug #73505) 2016-11-26 14:49:48 -08:00
Stanislav Malyshev 58cdd03d92 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add more mbfl string size checks (bug #73505)
 2016-11-26 14:48:40 -08:00
Stanislav Malyshev 5ee02b207d Add more mbfl string size checks (bug #73505) 2016-11-26 14:47:58 -08:00
Anatol Belski 6ec8b2c57d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  missing return
 2016-06-06 07:33:36 +02:00
Anatol Belski c05b417718 missing return 2016-06-06 07:28:12 +02:00
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 62da5cdf3d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  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/tests/create_path_error.phpt
	main/php_version.h
 2016-03-28 23:21:15 -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 f9c595f3c0 Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test 2016-01-18 10:54:07 +09: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