Commit graph

69 commits

Author SHA1 Message Date
Anatol Belski
b8a334f149 reapply platform related onig patches 2017-05-30 15:47:56 +02:00
Remi Collet
0ae2f95b8b Update Oniguruma to latest upstream version 6.3.0
Windows specific changes need to be applied again.
2017-05-30 14:14:57 +02:00
Anatol Belski
297e435722 remove accidentially commited file 2017-03-07 01:33:19 +01:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Anatol Belski
04eb73638b remove generated file 2016-11-25 22:07:00 +01:00
Anatol Belski
2a76d2282a upgrade to Oniguruma 6.1.2 2016-11-25 22:00:53 +01:00
Stanislav Malyshev
c3dfe57c23 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Sync fix for bug #72910 with current upstream
2016-09-04 19:15:30 -07:00
Stanislav Malyshev
d1fbc98ff6 Sync fix for bug #72910 with current upstream 2016-09-04 19:13:48 -07:00
Stanislav Malyshev
ccc8d92d3d Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #72910
  5.6.27 will be next
2016-09-01 23:28:44 -07:00
Stanislav Malyshev
e576714f6b Fix bug #72910
Merge upstream patch from 65bdf2a0d1
2016-09-01 23:27:06 -07:00
Lior Kaplan
e322fb0015 SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
Follow up for 3689b444
2015-12-02 19:30:05 +02:00
Anatol Belski
46101dbec5 fix incompatible types
namely between hash_data_type and st_data_t
2015-08-15 12:03:47 +02:00
Anatol Belski
3689b44453 add SIZEOF_SIZE_T to oniguruma 2015-08-15 11:39:06 +02:00
Anatol Belski
228eaf5bc4 fix pointer truncation cases 2015-08-15 11:27:07 +02:00
Anatol Belski
0e30c543ec upgrade to oniguruman 5.9.6 2015-03-12 13:42:36 +01:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Gustavo Frederico Temple Pedrosa
f5e22d06c3 Specifying MACRO for ppc64
Add PowerPC64 too, which is capable to access unaligned words.
2015-01-04 19:24:41 -08:00
Veres Lajos
1e3452992f typofixes 2014-08-17 16:00:39 +03:00
Anatol Belski
f5ebea91b0 updated to oniguruma to 5.9.5 2014-03-15 17:56:04 +01:00
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07: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
Anatol Belski
4091e94660 Fixed bug #64769 mbstring PHPTs crash on Windows x64
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
2013-05-08 19:22:37 +02: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
Antony Dovgal
75adcc8db0 backport the line from trunk and fix uninitialized variables 2011-11-19 13:23:16 +00:00
Rui Hirokawa
fe92d64a4a updated bundled oniguruma regex library to 5.9.2. fixed bug #42290. 2011-10-15 08:55:53 +00:00
Pierre Joye
4e00d919d2 - fix VC9 build (5.3+)
Please do not revert this fix again and to merge 5.3's changes to HEAD
2008-07-30 08:38:37 +00:00
Moriyoshi Koizumi
88318e0294 - MFH: Added a new configure option --with-onig=[DIR] that allows the extension
to link to the external oniguruma library.
- MFH: Prevent libmbfl files from being installed when --with-libmbfl is
  specified.
2008-07-16 02:30:49 +00:00
Rui Hirokawa
7aab46a2f1 updated bundled oniguruma from 4.4.0 to 4.7.1 2008-07-13 01:25:22 +00:00
Pierre Joye
64cf2c2f50 - MFH: fix build with VC9 PSDK6.x 2008-07-12 23:54:53 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Rui Hirokawa
beeddd8873 MFH: fixed bug #42502 va_* cannot detect. 2007-09-18 21:35:39 +00:00
Marcus Boerger
331034afbb - Revert last part and fix issue under windows 2007-03-06 01:19:47 +00:00
Marcus Boerger
3c21c05e43 - And the sizes too 2007-03-06 01:14:38 +00:00
Marcus Boerger
26ebcdfcb9 - More to go
# CVS sucks, you cannot mix -D with -r
# However, thanks edin for reminding me that we have mini version tags
# I still prefer subverison. There we don't have any problem of this kind
2007-03-06 01:13:21 +00:00
Marcus Boerger
638ffdb477 - There you go 2007-03-06 01:00:51 +00:00
Marcus Boerger
03bccc1b15 - MFH Revert back to sprintf (we could define snprintf for windows but we don't) 2007-03-06 00:56:42 +00:00
Ilia Alshanetsky
3c27b48662 Fixed typo 2007-02-28 01:10:41 +00:00
Ilia Alshanetsky
a9c4107ee4 Adjust vsnprintf() usage 2007-02-28 01:01:01 +00:00
Ilia Alshanetsky
efad70c2cc snprintf() -> slprintf() 2007-02-27 03:28:17 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
11235cff7b missing variable initialization 2006-10-10 22:03:27 +00:00
Antony Dovgal
9c4e7a0743 initialize variable and make valgrind happy 2006-09-28 07:22:37 +00:00
Seiji Masugata
0d233db56a Updated bundled oniguruma library (used for multibyte regular expression) to 4.4.4. fixed some Segmentation Fault, and build fails in OSX(Xcode 2.4/gcc 4.0.1 problem). See #38452. 2006-09-21 16:37:20 +00:00
Rui Hirokawa
10f7a23b6f fixed compilation problem on Mac OS/X. (bug #38892,38778,38452) 2006-09-20 23:10:37 +00:00
Seiji Masugata
100742f7a2 added configure option --disable-mbregex-backtrack. 2006-08-25 16:26:50 +00:00
Seiji Masugata
99211d0444 Initial commit. Updated bundled oniguruma library (used for multibyte regular expression) to 4.3.1. 2006-08-24 17:20:58 +00:00