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
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
d8de53d498
avoid unnecessary strlen calls in loop
2014-09-19 12:36:23 +02:00
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
6f9f0bf205
master renames phase 2
2014-08-25 19:28:33 +02:00
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
7ef536e4c9
Merge remote-tracking branch 'php/master'
...
Conflicts:
Zend/zend_exceptions.c
2014-08-21 13:54:15 +02:00
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
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
f2182ab845
some more pure naming replacements
2014-08-17 21:16:27 +02:00
543d5eb495
Merge branch 'PHP-5.6'
...
* PHP-5.6:
typofixes
Conflicts:
ext/spl/php_spl.c
2014-08-17 15:53:33 +03:00
56d02d564e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
typofixes
2014-08-17 15:51:15 +03:00
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
90d6f60bc1
mostly fixes to spl, but also some other
2014-08-17 13:31:39 +02:00
1169de3e61
fix some cases with fast zpp
2014-08-16 14:00:02 +02:00
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
cb25136f4e
fix macros in the 5 basic extensions
2014-08-16 11:37:14 +02:00
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
3f041ff2cb
Fixed compilation warnings
2014-06-20 15:04:38 +04:00
6ea228722b
fixed memory leak
2014-06-20 15:04:25 +04:00
dbaef7c038
Avoid unnecessary memory allocation/deallocations and pcre calls
2014-06-09 15:42:32 +04:00
dd0e96cca3
Bundle pcre-8.35 with sljit support
2014-06-06 18:46:19 +04:00
c1965f58d4
Use reference counting instead of zval duplication
2014-06-05 16:04:11 +04:00
2625f145c8
Use extended iteration API to avoid in-place modification
2014-05-28 12:39:27 +04:00
7fcd4064c0
Merge branch 'master' into phpng
...
* master: (41 commits)
fix test - output can be chunked
fix test
fix test
Fixed test for commit 997be125eb#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
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
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
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
f979e9afb0
More zend_string usage in PCRE
...
Avoid a few copies and zval duplications
2014-04-25 23:21:04 +02:00
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
d0ed1212a4
Enable PCRE JIT compiler
2014-04-25 08:33:37 +04:00
5864ce8a44
Fixed compilation warnings
2014-04-22 17:46:34 +04:00
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
81b24d4100
Fixed reference support
2014-04-16 12:08:16 +04:00
d0cc5c633c
Use zend_string* instead of char*
2014-04-15 22:10:39 +04:00
f9b26bc39a
Cleanup (2-nd round)
2014-04-15 21:56:30 +04:00
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
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
7240b4ec4d
Avoid unnecessary zval separations
2014-04-02 01:56:16 +04:00
dccd97d347
Avoid unnecessary zval separations
2014-04-01 23:44:42 +04:00
c6cba55454
Use ZVAL_DEREF() macro
2014-03-27 13:39:09 +04:00
54d559d893
Replaced (Z_TYPE(x) == IS_REFERENCE) with (Z_ISREF(x))
2014-03-27 11:50:45 +04:00
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
bf5e00f2e6
Fixed reference handling in pcre_grep
2014-03-16 15:40:35 +08:00
412ca11eda
Fixed reference arg hanlding in pcre_replace
2014-03-16 08:45:43 +08:00
ef1e006bd6
Refactor php_pcre_replace to return zend_string
2014-03-16 08:44:07 +08:00
6ad3abcd3e
Temporary fix memory leaks
2014-03-07 17:21:29 +04:00
b671c3a28a
Fixed refcounting
2014-03-07 17:17:35 +04:00
d599d0cecd
Temporary fix memory leaks
2014-03-07 17:14:16 +04:00
Nikita Popov