Pierre Joye
47335ef956
fix casting
2014-05-15 20:30:30 +02:00
Xinchen Hui
c242518bf0
There should been memory leaks(and don't use pointer cast)
2014-05-08 15:20:13 +08:00
Dmitry Stogov
9d21bef39f
Added support for apache and apache2handler SAPIs (They seem slower than FastCGI)
2014-05-06 13:26:23 +04:00
Dmitry Stogov
cd4b4dfc4d
Merge branch 'master' into refactoring2
...
Conflicts:
Zend/zend_hash.c
ext/date/php_date.c
2014-05-05 13:02:43 +04:00
Nikita Popov
404cc45ee2
Get php-fpm to work
...
At least phpinfo() works. Need to do more testing (how do you run
fpm with valgrind?)
2014-05-04 22:10:00 +02:00
Bob Weinand
f66449a467
Merge branch 'PHP-5.6'
2014-05-03 11:41:33 +02:00
Bob Weinand
003ba74d99
Merge sapi/phpdbg into PHP-5.6
2014-05-03 11:40:25 +02:00
Bob Weinand
3ad8616aff
Added stdion/stdout/stderr constsnts and their php:// wrappers
...
Fixes issue #85
2014-05-01 11:43:46 +02:00
Bob Weinand
191e3a0210
Merge sapi/phpdbg
2014-05-01 11:41:49 +02:00
Nikita Popov
257bf697ae
Fix php-cgi -m
2014-05-01 00:25:23 +02:00
Dmitry Stogov
17d027ed47
Split IS_BOOL into IS_FALSE and IS_TRUE
2014-04-30 18:32:42 +04:00
Stanislav Malyshev
f2a3be9627
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67060 : use default mode of 660
2014-04-29 09:17:10 -07:00
Stanislav Malyshev
c397fcc35f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67060 : use default mode of 660
2014-04-29 09:16:24 -07:00
Stanislav Malyshev
770fcdab90
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67060 : use default mode of 660
2014-04-29 09:15:23 -07:00
Stanislav Malyshev
35ceea928b
Fix bug #67060 : use default mode of 660
2014-04-29 09:14:11 -07:00
Anatol Belski
705909aa48
Merge branch 'PHP-5.6'
...
* PHP-5.6:
C89 compat
2014-04-27 18:02:07 +02:00
Anatol Belski
3b6bf6eec8
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
...
* phpdbg/master:
C89 compat
2014-04-27 18:01:26 +02:00
Anatol Belski
5dbe7c98e4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
removed /EHa as __try/__catch syntax is used anyway
fix ZEND_DEBUG usage
fix CFLAGS_PHPDBGS and some formatting
2014-04-26 00:17:09 +02:00
Anatol Belski
a10dc3aa4f
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
...
* phpdbg/master:
removed /EHa as __try/__catch syntax is used anyway
fix ZEND_DEBUG usage
fix CFLAGS_PHPDBGS and some formatting
2014-04-26 00:15:32 +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
65e2ed6e50
Redesigned zend_execute_data layout now EX(object), EX(scope) and EX(called_scope) arr properties of the current function execution co
...
ntext. They are set during zend_execute_data initialization and never changed.
2014-04-24 15:53:20 +04:00
Anatol Belski
ceec2152a6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
use a portable strndup implementation
fixed C89 compat
prepare config.w32
add parser files to dist
2014-04-24 11:07:08 +02:00
Anatol Belski
cd2641973c
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
2014-04-24 11:05:52 +02:00
Felipe Pena
fd96831f68
Merge branch 'PHP-5.6'
...
* PHP-5.6:
sapi/litespeed/lsapi_main.c: Fix bug #63228
2014-04-22 10:49:18 -03:00
George Wang
742f4704a9
sapi/litespeed/lsapi_main.c: Fix bug #63228
...
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2014-04-22 10:48:14 -03:00
Bob Weinand
823ddab3f3
Merge branch 'PHP-5.6'
2014-04-21 23:32:57 +02:00
Bob Weinand
708af5fd8e
Merge sapi/phpdbg into PHP-5.6
2014-04-21 23:30:08 +02:00
Dmitry Stogov
8ad8254a16
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-21 21:39:15 +04:00
Nikita Popov
bda96e3c58
Use zval_get_string in print_zval and propagate TSRMLS
2014-04-21 17:55:58 +02:00
Dmitry Stogov
72c287bd23
Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word
2014-04-21 18:25:34 +04:00
Stanislav Malyshev
185e5c0327
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:25:25 -07:00
Stanislav Malyshev
0df431482f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:25:03 -07:00
Stanislav Malyshev
6bad228b4e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:23:43 -07:00
Julio Pintos
49341e992a
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
...
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
2014-04-20 16:21:49 -07:00
Dmitry Stogov
ea2e1bb1eb
Optimized zend_leave_helper()
2014-04-18 13:46:36 +04:00
Dmitry Stogov
e96073b1e4
Moved zend_literal->cache_slot right into zval.
...
It should be accessed using Z_CACHE_SLOT() macro.
zend_literal structure is removed.
API functions that accepted pointer to zend_literal now accept pointer to zval or cache_slot directly.
Calls of such functiond that now accept cache_slot need to be changed to pass -1 instead of NULL.
2014-04-17 15:40:45 +04:00
Anatol Belski
0ffdcfe756
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:50:24 +02:00
Anatol Belski
b4c238c8cf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:48:31 +02:00
Anatol Belski
9eb726b3ab
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:47:49 +02:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Stanislav Malyshev
d3b433bb15
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:33:02 -07:00
Stanislav Malyshev
c1d5937f7f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:32:42 -07:00
Stanislav Malyshev
5811610d71
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:31:44 -07:00
itxx00
636adf251c
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:30:50 -07:00
Stanislav Malyshev
9fb92eed83
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix apr_psprintf format string from e0df4e3dba
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:40:21 -07:00
Stanislav Malyshev
1be29a404a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:39:32 -07:00
Stanislav Malyshev
c5275b4a92
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:37:55 -07:00
Jeff Trawick
442264ffd6
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:36:43 -07:00
Bob Weinand
ccf863c8ce
Merge branch 'PHP-5.6'
2014-04-11 19:35:11 +02:00