clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
105,473 Commits 493 Branches 1,365 Tags 848 MiB
db8bcdba80
Commit Graph

806 Commits

Author SHA1 Message Date
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Dmitry Stogov
4514ba016f Improved setlocale(). Eliminated locale comparison in ext/pcre if it's not necessary. 2014-12-19 18:00:16 +03:00
Dmitry Stogov
92655be7cf Enabled JIT for preg_split(). Use better zend_hash_*() functions. 2014-12-19 14:51:41 +03:00
Anatol Belski
2eef2abee5 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Optimize argument passing handlers:
  Fix pcre non-FAST_ZPP build

Conflicts:
	Zend/zend_compile.c
	Zend/zend_execute.h
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/pcre/php_pcre.c
 2014-12-16 17:13:47 +01:00
Andrea Faulds
ea7f768b2f Fix pcre non-FAST_ZPP build 2014-12-16 12:45:41 +00:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski
3ca0ca1548 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master: (102 commits)
  fix dir separator in test
  fix TS build
  fix TS build
  Better fix for bug #68446
  Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
  Revert NEWS and set test to XFAIL
  Revert "Fix bug #68446 (bug with constant defaults and type hints)"
  Improved zend_hash_clean() and added new optimized zend_symtable_clean()
  Use inline version of zval_ptr_dtor()
  Added new optimized zend_array_destroy() function
  Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
  fix REGISTER_NS_*_CONSTANT macros
  Removed useless assert. EG(uninitialized_zval) can't be refcounted.
  Use specialized destructors when types of zvals are known.
  move tests into proper place
  Improved assignment to object property
  Reuse zend_assign_to_variable() in zend_std_write_property()
  cleanup comments from svn/cvs era
  fix dir separator in test
  fork test for windows
  ...
 2014-11-26 08:17:35 +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
Anatol Belski
c6bad96f30 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master: (398 commits)
  NEWS
  add test for bug #68381
  Fixed bug #68381 Set FPM log level earlier during init
  proper dllexport
  move to size_t where zend_string is used internally
  fix some datatype mismatches
  return after the warning, to fix uninitialized salt usage
  fix datatype mismatches
  add missing type specifier
  fix datatype mismatches
  fix unsigned check
  "extern" shouldn't be used for definitions
  joined identical conditional blocks
  simplify fpm tests
  SEND_VAR_NO_REF optimization
  Add test for bug #68442
  Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
  Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
  Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
  Add new FPM test for IPv4/IPv6
  ...

Conflicts:
	win32/build/config.w32
 2014-11-18 21:18:52 +01:00
Stanislav Malyshev
bf59acdea7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

Conflicts:
	ext/pcre/php_pcre.c
 2014-11-03 11:40:15 -08:00
Stanislav Malyshev
90ba99a2c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib
 2014-11-03 11:38:29 -08:00
Stanislav Malyshev
279550ee85 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

Conflicts:
	configure.in
	ext/curl/interface.c
	main/php_version.h
 2014-11-03 11:37:43 -08:00
Stanislav Malyshev
c351b47ce8 Initialize the offset table - PCRE may sometimes miss offsets 2014-11-03 11:31:02 -08:00
Anatol Belski
9d21ff6b9e fix datatype mismatches 
PCRE uses plain datatypes, no typedefs.
 2014-10-29 15:30:11 +01:00
Anatol Belski
7a6a3d923b fix arg order, CFLAGS is the fifth arg in m4 2014-10-17 16:03:40 +02:00
Anatol Belski
0490a32249 more exts converted for static tsrm ls pointer 
mbstring, pcre, reflection
 2014-10-15 19:19:23 +02:00
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
d8de53d498 avoid unnecessary strlen calls in loop 2014-09-19 12:36:23 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
6f9f0bf205 master renames phase 2 2014-08-25 19:28:33 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
7ef536e4c9 Merge remote-tracking branch 'php/master' 
Conflicts:
	Zend/zend_exceptions.c
 2014-08-21 13:54:15 +02:00
krakjoe
1ba509ce19 use a suitable number of patterns to show the bug is resolved, not a stupid number that could cause memory limit to be exceeded or other side effects 2014-08-21 09:14:46 +01:00
Anatol Belski
77eb6e7278 Merge branch 'master' of git.php.net:php-src 
# By Veres Lajos (2) and Lior Kaplan (1)
# Via Lior Kaplan
* 'master' of git.php.net:php-src:
  Correct typo in comments: 'initialized'
  typofixes
  typofixes
 2014-08-17 21:40:39 +02:00
Anatol Belski
f2182ab845 some more pure naming replacements 2014-08-17 21:16:27 +02:00
Lior Kaplan
543d5eb495 Merge branch 'PHP-5.6' 
* PHP-5.6:
  typofixes

Conflicts:
	ext/spl/php_spl.c
 2014-08-17 15:53:33 +03:00
Lior Kaplan
56d02d564e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  typofixes
 2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Anatol Belski
90d6f60bc1 mostly fixes to spl, but also some other 2014-08-17 13:31:39 +02:00
Anatol Belski
1169de3e61 fix some cases with fast zpp 2014-08-16 14:00:02 +02:00
Anatol Belski
b7e7a89541 several fixes - 
- param parsing Z_PARAM_STR vs Z_PARAM_STRING
- some functions for new params
- etc
 2014-08-16 12:55:13 +02:00
Anatol Belski
cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov
27f38798a1 Fast parameter parsing API 
This API is experemental. It may be changed or removed.
It should be used only for really often used functions.
(Keep the original parsing code and wrap usage with #ifndef FAST_ZPP)
 2014-07-11 16:32:20 +04:00
Dmitry Stogov
3f041ff2cb Fixed compilation warnings 2014-06-20 15:04:38 +04:00
Dmitry Stogov
6ea228722b fixed memory leak 2014-06-20 15:04:25 +04:00
Dmitry Stogov
dbaef7c038 Avoid unnecessary memory allocation/deallocations and pcre calls 2014-06-09 15:42:32 +04:00
Dmitry Stogov
dd0e96cca3 Bundle pcre-8.35 with sljit support 2014-06-06 18:46:19 +04:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov
2625f145c8 Use extended iteration API to avoid in-place modification 2014-05-28 12:39:27 +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
Dmitry Stogov
376ab3b787 Nested PCRE calls may clobber extra->mark and it has to be reinitailized 
This fixes invalid memory writes (detected with valgrind) in Zend/tests/closure_047.phpt and Zend/tests/closure_048.phpt.
 2014-05-13 12:14:55 +04:00
Anatol Belski
c925c7a5b6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
 2014-05-09 22:16:42 +02:00
Anatol Belski
c62f32c3cc Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream 
upstream patch applied
 2014-05-09 22:15:54 +02:00
Nikita Popov
f979e9afb0 More zend_string usage in PCRE 
Avoid a few copies and zval duplications
 2014-04-25 23:21:04 +02:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
d0ed1212a4 Enable PCRE JIT compiler 2014-04-25 08:33:37 +04:00
Dmitry Stogov
5864ce8a44 Fixed compilation warnings 2014-04-22 17:46:34 +04:00
Dmitry Stogov
7652a977a8 Use ZEND_FETCH_FOREACH_* macros to iterate over HashTables instead of zend_hash_move_forward() and family. 2014-04-18 19:18:11 +04:00
Dmitry Stogov
81b24d4100 Fixed reference support 2014-04-16 12:08:16 +04:00
Dmitry Stogov
d0cc5c633c Use zend_string* instead of char* 2014-04-15 22:10:39 +04:00
Dmitry Stogov
f9b26bc39a Cleanup (2-nd round) 2014-04-15 21:56:30 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Dmitry Stogov
3d17219cd8 Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and family require second argument to be real pointer. 
&(ht)->nInternalPointer should be passed instead of NULL.
zend_hash_update_current_key() may work only with internal pointer.
 2014-04-07 23:14:17 +04:00
Dmitry Stogov
7240b4ec4d Avoid unnecessary zval separations 2014-04-02 01:56:16 +04:00
Dmitry Stogov
dccd97d347 Avoid unnecessary zval separations 2014-04-01 23:44:42 +04:00
Dmitry Stogov
c6cba55454 Use ZVAL_DEREF() macro 2014-03-27 13:39:09 +04:00
Dmitry Stogov
54d559d893 Replaced (Z_TYPE(x) == IS_REFERENCE) with (Z_ISREF(x)) 2014-03-27 11:50:45 +04:00
Nikita Popov
42562ee913 Add support for PCRE marks 
If a MARK is set then it will be returned in the $matches array
unter key "MARK". If no MARK is used or passed, the key will not
be set.
 2014-03-17 22:32:40 +01:00
Xinchen Hui
bf5e00f2e6 Fixed reference handling in pcre_grep 2014-03-16 15:40:35 +08:00
Xinchen Hui
412ca11eda Fixed reference arg hanlding in pcre_replace 2014-03-16 08:45:43 +08:00
Xinchen Hui
ef1e006bd6 Refactor php_pcre_replace to return zend_string 2014-03-16 08:44:07 +08:00
Dmitry Stogov
6ad3abcd3e Temporary fix memory leaks 2014-03-07 17:21:29 +04:00
Dmitry Stogov
b671c3a28a Fixed refcounting 2014-03-07 17:17:35 +04:00
Dmitry Stogov
d599d0cecd Temporary fix memory leaks 2014-03-07 17:14:16 +04:00
Dmitry Stogov
fff3c54f9e Added check 2014-03-06 22:07:28 +04:00
Xinchen Hui
10c7f2ddbc Fixed IS_REFERENCE handling in preg_match 2014-03-06 23:39:34 +08:00
Dmitry Stogov
045c5fddfa Fixed memory leaks 2014-02-28 13:37:55 +04:00
Dmitry Stogov
639e4e1afa Changes zend_is_callable() to use zend_string* instead of char* 2014-02-25 16:03:34 +04:00
Xinchen Hui
077b02326a Refactor php_addslashes using zend_string 2014-02-24 12:07:09 +08:00
Xinchen Hui
189a39a187 Fixed segfault 2014-02-19 18:49:00 +08:00
Xinchen Hui
43b03c74b3 Refacting smart_str 2014-02-18 17:42:46 +08:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Anatol Belski
f2d42e1624 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  pcre tests go with 8.34 upgrade
 2014-02-04 10:34:51 +01:00
Anatol Belski
ab32d36ec6 pcre tests go with 8.34 upgrade 2014-02-04 10:34:11 +01:00
Anatol Belski
353e2643ab Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  pcre upgraded to 8.34
 2014-02-04 10:31:52 +01:00
Anatol Belski
23cb7bd506 pcre upgraded to 8.34 2014-02-04 10:31:07 +01:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Dmitry Stogov
6c2a806820 Avoid interned hash key duplication and hash key length recaclulation 2013-11-29 00:57:49 +04:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -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
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Anatol Belski
96388c78c9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix zts check
 2013-03-14 14:39:47 +01:00
Anatol Belski
5df8cf1975 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix zts check
 2013-03-14 14:39:09 +01:00
Anatol Belski
e43c5a8395 fix zts check 2013-03-14 14:38:20 +01:00
Anatol Belski
2635408a0d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:15:17 +01:00
Anatol Belski
4e46a87392 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:14:14 +01:00
Stephen A. Zarkos
b6fdb60ecf Fixed PCRE locale crash in Windows/TS 2013-03-04 09:09:45 +01:00
Anatol Belski
1cda84a986 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  merged PCRE 8.32
 2013-03-03 19:10:12 +01:00
Anatol Belski
ca4a3e6138 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  merged PCRE 8.32
 2013-03-03 19:07:49 +01:00
Anatol Belski
357ab3cbad merged PCRE 8.32 
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
 2013-03-03 19:06:22 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Adam Harvey
0b96b4c4e9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update arginfo for preg_match_all() to reflect reality.
  fix invalid read when trimming empty string
 2012-11-12 20:09:18 +08:00
Adam Harvey
bca8ff723d Update arginfo for preg_match_all() to reflect reality. 
Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.
 2012-11-12 20:04:26 +08:00
Dmitry Stogov
0716ddcdb2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #63180 (Corruption of hash tables)
  fix bug #63369

Conflicts:
	NEWS
 2012-10-26 09:49:21 -07:00
Dmitry Stogov
68b229ea73 Fixed bug #63180 (Corruption of hash tables) 2012-10-26 09:47:30 -07:00
Anatoliy Belsky
8b0704618f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #63284 PCRE upgrade to 8.31
 2012-10-19 09:52:43 +02:00
Anatoliy Belsky
d2fa182f25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63284 PCRE upgrade to 8.31
 2012-10-19 09:51:58 +02:00
Anatoliy Belsky
276c5de0d8 Fixed bug #63284 PCRE upgrade to 8.31 2012-10-19 09:49:28 +02:00
Xinchen Hui
9714ceb92b Merge branch 'PHP-5.4' 2012-10-18 20:14:54 +08:00
Xinchen Hui
f1478bbf9d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:13:36 +08:00
Xinchen Hui
db2dc7a6a4 indent 2012-10-18 20:13:14 +08:00
Xinchen Hui
84efca62ff Merge branch 'PHP-5.4' 2012-10-18 20:12:00 +08:00
Xinchen Hui
1f8fd609b0 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:11:32 +08:00
Xinchen Hui
e88cdaa014 better fix for #63055 2012-10-18 20:10:35 +08:00
Xinchen Hui
4eece4c86a Merge branch 'PHP-5.4' 2012-10-18 17:35:29 +08:00
Xinchen Hui
54cef2bb6d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 17:33:52 +08:00
Xinchen Hui
8bd5e15ff7 Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite) 2012-10-18 17:31:27 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Stanislav Malyshev
ab566a9712 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix bug #55856: preg_replace should fail on trailing garbage
  Bug #62956: fixing private method signature validation
  NEWS for 886a50a
 2012-08-28 22:02:15 -07:00
Stanislav Malyshev
8b3c1a380a fix bug #55856: preg_replace should fail on trailing garbage 2012-08-28 21:59:20 -07:00
Nikita Popov
be202d3d35 Deprecate /e modifier 
See https://wiki.php.net/rfc/remove_preg_replace_eval_modifier.
 2012-03-04 13:39:12 +00:00
Rasmus Lerdorf
4ecfa5abf5 Safer way to call pcre_fullinfo - bug 60986 2012-02-06 18:18:53 +00:00
Rasmus Lerdorf
c950030b3f Safer way to call pcre_fullinfo - bug 60986 2012-02-06 18:18:53 +00:00
Rasmus Lerdorf
090bb97555 Safer way to call pcre_fullinfo - bug 60986 2012-02-06 18:18:53 +00:00
Rasmus Lerdorf
0f6e3408db Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
704c45ec3e Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
0f0261e0b7 Fix for bug 60986 2012-02-06 18:11:56 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Pierre Joye
43d20bca91 - revert incorrect fix introduced in r316528 2011-09-12 12:59:52 +00:00
Pierre Joye
4ce7228b00 - revert incorrect fix introduced in r316528 2011-09-12 12:59:52 +00:00
Pierre Joye
4891b29d6b - revert incorrect fix introduced in r316528 2011-09-12 12:59:52 +00:00
Hannes Magnusson
5e661cf904 Ensure we are working with strings here 2011-09-12 11:44:55 +00:00
Hannes Magnusson
ee27f57095 Ensure we are working with strings here 2011-09-12 11:44:55 +00:00
Hannes Magnusson
7bb31903c8 Ensure we are working with strings here 2011-09-12 11:44:55 +00:00
Ferenc Kovacs
1313220640 These regexes don't fail under the new backtrack limit, so lower it just for the test to check the failure. 2011-09-04 13:27:19 +00:00
Rasmus Lerdorf
741f41ff18 efree match_sets on an error here - found by Coverity 2011-08-05 22:39:40 +00:00
Rasmus Lerdorf
f7e07ae69b efree match_sets on an error here - found by Coverity 2011-08-05 22:39:40 +00:00
Rasmus Lerdorf
c9342c81d6 efree match_sets on an error here - found by Coverity 2011-08-05 22:39:40 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierrick Charron
824726073b Delete empty test files (old MQ tests) 2011-07-22 12:12:05 +00:00
Pierrick Charron
fb5da94c1b Delete empty test files (old MQ tests) 2011-07-22 12:12:05 +00:00
Pierre Joye
45420bb669 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4 2011-07-22 11:56:20 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Rasmus Lerdorf
c9e41e8901 These regexes don't fail under the new backtrack limit, so lower it 
just for the test to check the failure.
 2011-06-12 18:38:26 +00:00
Rasmus Lerdorf
c30bde0ef5 These regexes don't fail under the new backtrack limit, so lower it 
just for the test to check the failure.
 2011-06-12 18:38:26 +00:00
Rasmus Lerdorf
ba8ce4a6d4 Increase the overly conservative pcre backtrack limit from 100000 to 1000000 2011-05-21 19:48:37 +00:00
Rasmus Lerdorf
f5a9e17f9c Increase the overly conservative pcre backtrack limit from 100000 to 1000000 2011-05-21 19:48:37 +00:00
Rasmus Lerdorf
cebe2a2139 Increase the overly conservative pcre backtrack limit from 100000 to 1000000 2011-05-21 19:48:37 +00:00
Scott MacVicar
74b8f72017 Fix Windows build, this really should be in a patch file / README. 
I'll fix this up later.
 2011-05-13 13:51:07 +00:00
Scott MacVicar
db0c957f02 Fix Windows build, this really should be in a patch file / README. 
I'll fix this up later.
 2011-05-13 13:51:07 +00:00
Scott MacVicar
27fc1b889a Update bundled PCRE to 8.12 2011-05-13 07:00:45 +00:00
Scott MacVicar
6ec23faa99 Update bundled PCRE to 8.12 2011-05-13 07:00:45 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Gustavo André dos Santos Lopes
ff32c32fba - Fix PCRE build on Windows; closes bug #53606. 2010-12-24 19:01:25 +00:00
Gustavo André dos Santos Lopes
3143828eb3 - Fix PCRE build on Windows; closes bug #53606. 2010-12-24 19:01:25 +00:00
Ilia Alshanetsky
34c6447e9e Upgraded\ bundled\ PCRE\ to\ version\ 8.11. 2010-12-24 15:03:29 +00:00
Ilia Alshanetsky
15b7a4476a Upgraded\ bundled\ PCRE\ to\ version\ 8.11. 2010-12-24 15:03:29 +00:00
Pierre Joye
aea6771d19 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Felipe Pena
43206c8c68 - Added missing test 2010-11-15 18:46:59 +00:00
Felipe Pena
1db7472a73 - Coding standards 2010-11-06 18:35:38 +00:00
Felipe Pena
1c556f2030 - Coding standards 2010-11-06 18:35:38 +00:00
Felipe Pena
f4927c28bc - Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it returns int(0)) 
patch by: slugonamission at gmail dot com
 2010-11-06 18:32:10 +00:00
Felipe Pena
03cbbf4348 - Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it returns int(0)) 
patch by: slugonamission at gmail dot com
 2010-11-06 18:32:10 +00:00
Adam Harvey
6bc20667c7 Fix bracket in prototype comment. 2010-11-05 18:12:30 +00:00
Adam Harvey
8365739663 Implemented FR #53238 (Make third parameter of preg_match_all optional). 2010-11-05 04:37:27 +00:00
Felipe Pena
090a9b3331 - Fixed bug #52971 (PCRE-Meta-Characters not working with utf-8) 
#   In  PCRE,  by  default, \d, \D, \s, \S, \w, and \W recognize only ASCII
#       characters, even in UTF-8 mode. However, this can be changed by setting
#       the PCRE_UCP option.
 2010-10-03 16:01:38 +00:00
Felipe Pena
87a2373422 - Fixed bug #52971 (PCRE-Meta-Characters not working with utf-8) 
#   In  PCRE,  by  default, \d, \D, \s, \S, \w, and \W recognize only ASCII
#       characters, even in UTF-8 mode. However, this can be changed by setting
#       the PCRE_UCP option.
 2010-10-03 16:01:38 +00:00
Ilia Alshanetsky
bbeafa1dcf Win32 build fixes 2010-08-14 14:47:49 +00:00
Ilia Alshanetsky
c5602787fc MFH: Upgraded bundled PCRE to version 8.10. 2010-08-14 14:37:13 +00:00
Kalle Sommer Nielsen
a448b6a72b MFB53: Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570) 
# Some of the updated tests were to make them sync with 5.3 although they don't run on trunk anymore
 2010-08-11 21:41:30 +00:00
Kalle Sommer Nielsen
8deefa8780 Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570) 
# Trunk patch will follow shortly
 2010-08-11 21:12:18 +00:00
Pierre Joye
8d0fb1c964 - fix build 2010-07-29 12:06:15 +00:00
Pierre Joye
110fab9803 - fix build 2010-07-29 11:58:41 +00:00
Sriram Natarajan
a0bf0739a9 - Fixed bug #52436 (Compile error in pcre if systems do not have stdint.h) 
# PCRE's config.h can very well reuse the definitions made available from
# PHP's configure script output available within php_config.h
 2010-07-27 21:42:22 +00:00
Sriram Natarajan
e4be370479 - Fixed bug #52436 (Compile error in pcre if systems do not have stdint.h) 
# PCRE's config.h can very well reuse the definitions made available from
# PHP's configure script output available within php_config.h
 2010-07-27 21:42:22 +00:00
Kalle Sommer Nielsen
b4c573c7ec Fixed Windows build 2010-07-08 15:09:57 +00:00
Ilia Alshanetsky
ef22824315 Upgraded bundled PCRE to version 8.10 2010-07-02 17:17:16 +00:00
Pierre Joye
94ef6d481f - fix build 2010-04-01 10:34:05 +00:00
Pierre Joye
60176163f1 - fix build 2010-04-01 10:34:05 +00:00
Ilia Alshanetsky
e99039d692 Upgraded bundled PCRE to version 8.02. 2010-03-29 11:58:06 +00:00
Ilia Alshanetsky
6e92347ddf Upgraded bundled PCRE to version 8.02. 2010-03-29 11:58:06 +00:00
Pierre Joye
add029adef - fix win build, use bundled stdint 2010-01-21 23:23:17 +00:00
Ilia Alshanetsky
50016d9dec Upgraded bundled PCRE to version 8.01 2010-01-21 17:49:38 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Felipe Pena
a94558c855 - Added MAKE_COPY_ZVAL(ppzv, pzv) macro 2009-12-08 01:57:37 +00:00
Scott MacVicar
f03b175f7c Update PCRE to 8.00 2009-11-03 12:15:03 +00:00
Dmitry Stogov
7bfe056174 Fixed tests 2009-09-21 09:52:19 +00:00
Felipe Pena
b4ee727353 - Fixed bug #49483 (preg_replace 'subject' parameter listed as optional) 2009-09-06 17:41:34 +00:00
Scott MacVicar
6ffe4b2eff We should check /usr/local/include last 2009-08-11 21:40:15 +00:00
Scott MacVicar
94976f4694 Search /usr/include too for those wanting to use a system PCRE. 2009-08-11 12:03:29 +00:00
Zoe Slattery
9ff94c82df Remove empty sections. Fix bad use of --SKIP-- 2009-07-21 14:02:24 +00:00
andy wharmby
0fbf8cebd7 Fix test 2009-06-23 23:00:55 +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
Jani Taskinen
996eab8983 - Fixed ini deprecation message issues in tests. 
# CGI headers are stripped and the error ends up there with CGI..
 2009-05-06 20:32:00 +00:00
Kalle Sommer Nielsen
5a6d3cc42b Added E_DEPRECATED startup notice (5.3 only) 2009-05-04 21:18:22 +00:00
Arnaud Le Blanc
1bef730840 MFH 2009-04-25 21:13:07 +00:00
Arnaud Le Blanc
54958dbc7c MFH 2009-04-24 17:14:32 +00:00
Nuno Lopes
90a2d19794 upgrade PCRE to version 7.9 2009-04-11 18:57:27 +00:00
Nuno Lopes
ae57857eba fix bug #47662: support more than 127 named subpatterns 2009-04-10 15:47:15 +00:00
Nuno Lopes
4ff9ad5bf1 fix bug #47229: preg_quote should escape '-' 2009-01-28 22:39:33 +00:00
Rob Richards
c87d6031e5 MFH: export php_pcre_free to make mbstring happy 2009-01-11 13:59:00 +00:00
andy wharmby
1f56f22fa3 New pcre extension tests. Tested on Windows, Linux and Linux 64-bit 2009-01-07 14:52:26 +00:00
Andi Gutmans
8accd1addc - Remove NO_RECURSE as it causes a huge performance impact. Up to 50% 
with Wordpress. Stack size is not really anymore of an issue than on
  Linux with FastCGI (php-cgi.exe). For ISAPI it may be an issue but we
  have other places where we may eat up stack.
 2009-01-02 04:59:41 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Nuno Lopes
c61d5627ba export the pcre API when compiling with gcc 4. this fixes e.g. the linkage of APC (reported by shire) 2008-12-10 10:16:14 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
ade487e693 - Opss, reverted accidental changes 2008-11-03 13:07:28 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
261f0c32a5 initialize optional vars 2008-10-21 22:08:20 +00:00
Nuno Lopes
8a77e55566 clean some dead code (with static analysis help) 2008-09-23 15:18:26 +00:00
Nuno Lopes
c778b3eb19 upgrade to PCRE 7.8. this includes a security improvement. I'll upgrade HEAD later (not urgent..) 2008-09-09 07:55:10 +00:00
Nuno Lopes
1e3ebc2373 kill dead variables. found by LLVM's clang static analyzer 2008-09-02 19:10:38 +00:00
Nuno Lopes
426a1251f6 remove unicode skipif, as the test doesnt require such support 2008-08-31 15:28:35 +00:00
Marcus Boerger
42eb47d500 - MFH preg_filter() 
# As discussed with Lukas
# [DOC] check out the test
 2008-08-29 12:13:54 +00:00
Nuno Lopes
f797495527 after rereading the documentation about preg_grep(), lets match the behavior in HEAD (return the original array elements instead of the new string). 
tune the test accordingly
 2008-08-14 14:37:39 +00:00
Nuno Lopes
31c657b3bb Fixed bug #44925 (preg_grep() modifies input array) 2008-08-14 13:12:42 +00:00
Felipe Pena
e304515ddb - MFH: Added parameter TSRMLS_DC in zend_is_callable() 2008-08-02 04:46:07 +00:00
Dmitry Stogov
d5ef2f466c Added support for lambda functions and closures 2008-07-14 09:49:03 +00:00
Nuno Lopes
d771fa6da1 fix CVE-2008-2371. patch by Tavis Ormandy 
# currently there's no release of PCRE with this fix. PCRE's author recommended applying this patch in the meantime
 2008-07-06 15:23:31 +00:00
Nuno Lopes
053dc572ca upgrade to PCRE 7.7 2008-07-06 15:17:25 +00:00
Felipe Pena
235aab6c0f - New parameter parsing API (to preg_replace*) 
- Fixed related tests
 2008-06-30 17:14:48 +00:00
Felipe Pena
7ddf985e05 - zend_arg_defs.c is unnecessary now 2008-06-30 12:15:53 +00:00
Pierre Joye
c9ec9fed7b - set PHP_[EXTNAME] to yes for spl, pcre and reflection (always on), this variable is required by ADD_EXTENSION_DEP 2008-06-23 10:22:42 +00:00
Jani Taskinen
f047195f55 MFH: simplify, readability 2008-06-02 14:12:20 +00:00
Hannes Magnusson
49961368be Add arginfo & fix protos 2008-06-01 18:47:20 +00:00
Antony Dovgal
8e6ea84fdd MFH: use bundled PCRE library when both yes & no passed as argument, 
look for headers and the lib otherwise
 2008-05-23 19:07:27 +00:00
Elizabeth Marie Smith
3adf07b5c6 Fix reflection (always static, never shared) and disable turning off pcre and spl (also always static, never shared) 2008-05-02 14:05:53 +00:00
Marcus Boerger
aa64c6727c - MFH No longer allow to disable pcre 2008-04-10 19:42:32 +00:00
Nuno Lopes
634fef42d6 fix bug #44214: crash with preg_replace_callback and global variables 2008-03-08 13:01:59 +00:00
Nuno Lopes
d204214d7f implement #44336: optimize utf8 string matching 
add PREG_BAD_UTF8_OFFSET_ERROR constant
 2008-03-08 11:58:12 +00:00
Nuno Lopes
0d0a7a432a add new tests 2008-03-08 11:50:20 +00:00
Dmitry Stogov
bcade81501 Removed unnecassary strlen() 2008-03-03 11:11:43 +00:00
Felipe Pena
3fd8ccb092 Fix test 2008-02-21 14:22:41 +00:00
Antony Dovgal
9609e195e9 fix test 2008-02-21 13:39:04 +00:00
Felipe Pena
bc8a62f4b1 MFB: Fixed Bug #44191 (preg_grep messes up array index) 2008-02-20 22:12:17 +00:00
Felipe Pena
d427b55b1a New test 2008-02-20 21:57:05 +00:00
Nuno Lopes
3f7b92c06c upgrade to PCRE 7.6. 
#changes to code are minimal. this fixes a security bug
 2008-01-29 20:18:02 +00:00
Nuno Lopes
2c1a5c0248 spread some static keywords 2008-01-25 19:38:26 +00:00
Nuno Lopes
5ad7fb31c3 MFB5.2: fix script for files with short names 2008-01-14 09:40:29 +00:00