1
0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Commit Graph

106 Commits

Author SHA1 Message Date
Nikita Popov e33f3d3b7c Move smart_str implementation into Zend/
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski 469c9bdb39 simplify condition 2014-09-19 16:30:01 +02:00
Anatol Belski bf7203e1e0 fix empty string check 2014-09-19 11:23:23 +02:00
Anatol Belski 49a6b485a0 redo the fix casting to size_t where applicable 2014-09-16 21:17:19 +02:00
Anatol Belski fba6e5a8cb fix signed/unsigned mismatch warnings 2014-09-16 21:17:16 +02:00
Anatol Belski 6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski 3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski 6428b49851 ported ext/mbstring 2014-08-19 19:42:16 +02:00
Anatol Belski 63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov 7fcd4064c0 Merge branch 'master' into phpng
* master: (41 commits)
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  ...

Conflicts:
	ext/bz2/bz2.c
	ext/gd/gd.c
	ext/mbstring/php_mbregex.c
	ext/session/tests/031.phpt
	ext/simplexml/simplexml.c
	ext/spl/spl_fixedarray.c
2014-05-13 15:24:40 +04:00
Yasuo Ohgaki 997be125eb Fixed bug #67199 mb_regex_encoding mishmash 2014-05-12 13:33:53 +09:00
Xinchen Hui d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Dmitry Stogov 050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Dmitry Stogov 48d3b95aee Fixed NULL pointer dereferencing 2014-04-09 11:56:48 +04:00
Xinchen Hui 506f6a4282 Refactor mbstring (incompleted) 2014-03-24 12:40:07 +08:00
Xinchen Hui 9011a70c7f Refactor mbstring (incompleted) 2014-03-23 23:38:32 +08:00
Xinchen Hui 946269e48e Refactor mbstring (incompleted) 2014-03-23 20:04:58 +08:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Stanislav Malyshev 02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Moriyoshi Koizumi 20eb33b321 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:05:17 +09:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Felipe Pena 8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 16fbcf7188 - Fix the fix (thanks Chris Jones!) 2011-11-22 19:18:34 +00:00
Felipe Pena 18768584e2 - Fixed possible crash in mb_ereg_search_init() using empty pattern 2011-11-21 19:15:18 +00:00
Xinchen Hui c8ff0fe254 Fix #55819 crash on mb_ereg_replace_callback
Need hirokawa to review this.
2011-10-07 04:24:04 +00:00
Rui Hirokawa 9b1c6035d2 fixed seg faults for mb_ereg_replace_callback. 2011-09-25 08:33:43 +00:00
Rui Hirokawa 1297c0508a added mb_ereg_replace_callback(). 2011-09-25 08:01:54 +00:00
Felipe Pena 0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Dmitry Stogov b65f1dae41 Reduced overhead of ext/mbstring initialization 2010-07-05 12:03:08 +00:00
Sebastian Bergmann 9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Matt Wilmas d55300298e MFH: Added zend_eval_stringl and made create_function(), etc. binary-safe 2009-06-05 18:50:32 +00:00
Sebastian Bergmann 08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Moriyoshi Koizumi 8fe2cb8ced - MFH: Properly initialize/finalize the library. This plugs the leaks caused by
onig_new().
2008-09-13 02:33:15 +00:00
Moriyoshi Koizumi 9225429040 - MFH: Fix warnings 2008-07-25 14:04:54 +00:00
Moriyoshi Koizumi 90f9a8e457 - Remove duplicated lines. 2008-07-22 09:18:30 +00:00
Moriyoshi Koizumi f78da21527 - MFH: Removed dependencies from php_mbregex to oniguruma types 2008-07-17 16:08: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
Jani Taskinen 0cd842e51b nuke unused variable 2008-07-11 13:50:43 +00:00
Antony Dovgal e035184017 string length -> int 2008-07-01 07:54:30 +00:00
Alexey Zakhlestin 1c77f59429 updated to the new parameter-parsing api 2008-06-28 21:23:08 +00:00
Rui Hirokawa ad400f1144 fixed #43994 mb_ereg 'successfully' matching incorrectly. 2008-02-16 11:46:03 +00:00
Sebastian Bergmann d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Jani Taskinen 3e0680f2ee MFH:- Fixed bug #31911 (mb_ereg*_replace() crashes when replacement string is invalid
PHP expression and 'e' option is used)
2007-11-16 12:26:34 +00:00
Yiduo (David) Wang 4b4d634cb9 MFH: Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:22:07 +00:00
Antony Dovgal ed30473f7c MFH 2007-01-11 22:23:20 +00:00
Sebastian Bergmann 4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00