Dmitry Stogov
d146d15003
Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate()
2015-03-20 02:02:42 +03:00
Wei Dai
25566c67fe
Implement preg_replace_callback_array function
2015-03-13 11:52:36 +08:00
Dmitry Stogov
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
Reeze Xia
609f05fc19
ZTS cleanup
2015-03-08 19:25:55 +08:00
Anatol Belski
30830bcefd
Fixed bug #69115 crash in mail
...
There were two issues
- php_pcre_replace could be used directly and sbject_str could be NULL
- the Windows sendmail variant was freeing something passed from the outside
2015-02-27 10:42:20 +01:00
Dmitry Stogov
4241a090ad
Avoid reallocation in preg_replace() if nothing was replaced
2015-02-10 13:30:25 +03:00
Anatol Belski
be718e45b0
added PCRE JIT availability info to phpinfo()
...
and a test to ensure it's enabled
2015-02-07 11:04:53 +01:00
Dmitry Stogov
da5439b9c8
Re-enable PCRE JIT disabled by b436c714c6
2015-02-06 14:02:15 +03:00
Arjen Schol
b436c714c6
Upgrade pcre to 8.36
2015-02-04 14:08:41 +01:00
Nikita Popov
cb9c99ebd0
Remove preg_replace /e modifier
2015-01-26 21:00:23 +01:00
Xinchen Hui
020610ee40
Remove addslashes_str
2015-01-20 10:11:48 +08:00
Xinchen Hui
da7d8f45b2
Optimized php_addslashes
2015-01-19 10:46:39 -05:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Xinchen Hui
d7fd940691
Fixed #68704
2015-01-08 16:26:20 +08:00
Anatol Belski
3485925a3a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
remove BOM from NEWS
2014-12-30 16:51:06 +01:00
Anatol Belski
d5123415f6
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
2014-12-30 16:50:22 +01:00
Dmitry Stogov
7624fb6e8b
Fixed possible crash (pcre cache must keep permanent strings)
2014-12-23 14:38:30 +03:00
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