Dmitry Stogov
6bf24f4dd0
Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)
2014-07-04 18:03:45 +04:00
Xinchen Hui
2393000aeb
Prefer the macro we defined
2014-05-07 17:06:27 +08:00
Xinchen Hui
ed5b6af8af
Refactored filter
2014-05-07 16:52:58 +08: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
Anatol Belski
60f976a45e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix dll export
2014-04-24 10:53:31 +02:00
Anatol Belski
9280e25534
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dll export
2014-04-24 10:52:59 +02:00
Anatol Belski
acfed1c4c7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix dll export
2014-04-24 10:52:22 +02:00
Anatol Belski
03be983398
fix dll export
2014-04-24 10:51:42 +02:00
Bob Weinand
eae0f529f2
Merge branch 'PHP-5.6'
2014-04-12 23:55:35 +02:00
Bob Weinand
53b1dce587
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-12 23:54:57 +02:00
Bob Weinand
9302be3754
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-12 23:54:29 +02:00
Bob Weinand
edd90e5ae3
Made usage of php_hash_environment useful by updating instead of just adding argc
2014-04-12 23:53:21 +02:00
Dmitry Stogov
76cc99fe60
Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc)
2014-04-03 15:26:23 +04:00
Dmitry Stogov
887189ca31
Refactored IS_INDIRECT usage for CV and object properties to support HashTable resizing
2014-03-26 18:07:31 +04:00
Dmitry Stogov
aa5f55306b
Refactored EG(active_symbol_table) to be zend_array* instead of HashTable*
2014-03-17 23:15:22 +04:00
Xinchen Hui
f76a64fd3a
Fixed variable name register
2014-03-05 14:20:47 +08:00
Xinchen Hui
43b03c74b3
Refacting smart_str
2014-02-18 17:42:46 +08:00
Dmitry Stogov
2b9b9afa7a
Use better data structures (incomplete)
2014-02-17 17:59:18 +04:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08: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
Michael Wallner
4797f7ad16
Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
2013-12-30 14:28:43 +01:00
Anatol Belski
86dfe7be49
better way to fix PRIu64 availability on windows
2013-09-18 15:14:36 +02:00
Anatol Belski
4a85b5e190
fix build - PRIu64 vs %I64u
2013-09-17 16:02:08 +02:00
Michael Wallner
1c15d70cbd
Merge branch 'slim-postdata'
...
* slim-postdata:
slim post data
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
Michael Wallner
2438490add
slim post data
2013-08-27 13:31:35 +02:00
Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07: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
Andrew Faulds
d12f8d6790
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
...
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Xinchen Hui
2e5e82a8ca
MFH: Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars)
2012-03-02 03:18:04 +00:00
Dmitry Stogov
04f6171012
Improved max_input_vars directive to check nested variables
2012-02-14 08:58:52 +00:00
Dmitry Stogov
2ad7f44b7b
Improved max_input_vars directive to check nested variables
2012-02-14 08:58:52 +00:00
Xinchen Hui
6672171672
Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars).
2012-02-08 14:07:27 +00:00
Dmitry Stogov
29a909edcc
Fixed memory leaks
2012-02-02 10:26:53 +00:00
Dmitry Stogov
cc1829d187
Fixed memory leaks
2012-02-02 10:26:53 +00:00
Stanislav Malyshev
4558f06648
fix UMR in php_register_variable_ex, reported by Stefan Esser
2012-02-01 19:52:05 +00:00
Stanislav Malyshev
9cb8f3ad48
fix UMR in php_register_variable_ex, reported by Stefan Esser
2012-02-01 19:52:05 +00:00
Patrick Allaert
b1721549dd
Changed: restoring REQUEST_TIME as a long, introducing REQUEST_TIME_FLOAT instead as discussed on the ML
2012-01-06 13:38:06 +00:00
Patrick Allaert
a4305214a3
Changed: restoring REQUEST_TIME as a long, introducing REQUEST_TIME_FLOAT instead as discussed on the ML
2012-01-06 13:37:51 +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
Dmitry Stogov
cef0d27af9
Change fatal error into warning and ignore arguments over limit
2011-12-22 15:31:41 +00:00
Dmitry Stogov
3305f5b133
Change fatal error into warning and ignore arguments over limit
2011-12-22 15:31:41 +00:00
Dmitry Stogov
6fb3897f80
Added max_input_vars directive to prevent attacks based on hash collisions
2011-12-14 08:56:35 +00:00
Dmitry Stogov
4ffedc700d
Added max_input_vars directive to prevent attacks based on hash collisions
2011-12-14 08:56:35 +00:00
Dmitry Stogov
4a25a7740d
Fixed ZE specific compile warnings (Bug #55629 )
2011-09-13 13:29:35 +00:00