c242518bf0
There should been memory leaks(and don't use pointer cast)
2014-05-08 15:20:13 +08:00
cd4b4dfc4d
Merge branch 'master' into refactoring2
...
Conflicts:
Zend/zend_hash.c
ext/date/php_date.c
2014-05-05 13:02:43 +04:00
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
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
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
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
35ceea928b
Fix bug #67060 : use default mode of 660
2014-04-29 09:14:11 -07: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
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
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
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
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
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
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
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
636adf251c
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:30:50 -07:00
eb6941e902
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:12:09 +04:00
6e15afd1be
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:06:32 +04:00
a97ae8bc06
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-24 11:53:40 +04:00
a16304f836
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-24 11:47:44 +04:00
5de7115679
Use better data structures (incomplete; able to run bench.php)
2014-02-18 16:27:38 +04:00
464b1bc4fb
Merge branch 'PHP-5.6'
2014-02-14 17:19:33 +02:00
a7ec000f35
a few typofixes
2014-02-14 17:16:17 +02:00
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
98e6c8ca2d
fix indentation
2014-01-17 12:49:21 +04:00
dff0d51243
Add some basic and apparmor tests to fpm
2014-01-17 12:49:07 +04:00
e3d3283405
Add --force-stderr to fpm
2014-01-17 12:49:00 +04:00
f6d137a716
Add apparmor change hat functionality to fpm
2014-01-17 12:48:33 +04:00
a053e69991
fix indentation
2014-01-17 12:22:07 +04:00
998f506b6d
Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src
...
* 'fpm-apparmor-fixed' of https://github.com/notti/php-src :
Add some basic and apparmor tests to fpm
Add --force-stderr to fpm
Add apparmor change hat functionality to fpm
2014-01-16 17:36:03 +04:00
e9883779a0
Add some basic and apparmor tests to fpm
2014-01-07 00:21:24 +01:00
32d9409a24
Add --force-stderr to fpm
2014-01-07 00:19:01 +01:00
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
fb4678f1ac
Merge branch 'PHP-5.6'
2013-12-27 20:46:08 +08:00
a8cd9b417c
Fixed bug #66358 (fpm starts segfault)
2013-12-27 20:45:43 +08:00
ed5a8d510f
Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs
2013-12-18 09:06:39 +01:00
a0244a69cc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #66008
2013-10-31 03:18:36 -07:00
812dfbc431
Fix bug #66008
2013-10-31 03:18:07 -07:00
b4bed6fde0
Fix bug #66008
2013-10-31 03:06:35 -07:00
09ad5fbbb3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Improved performance of func_get_args() by eliminating useless copying
fix limitation of upload size == (U)INT_MAX in CGI
Link to more readmes
test commit
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:46:40 +04:00
8962f3ff0c
fix limitation of upload size == (U)INT_MAX in CGI
2013-10-28 07:37:47 +01:00
73788d1c23
Merge branch 'PHP-5.5'
...
* PHP-5.5:
increase backlog to the highest value everywhere
2013-10-27 22:57:31 +04:00
9765763413
increase backlog to the highest value everywhere
...
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
2013-10-27 22:54:47 +04:00
454a9fcb14
Merge branch 'master' of https://github.com/guggemand/php-src
...
* 'master' of https://github.com/guggemand/php-src :
Dont reset other counters when incrementing slow_rq
2013-10-21 12:04:37 +02:00
41da537614
Merge branch 'master' of https://github.com/DylanArnold/php-src
...
* 'master' of https://github.com/DylanArnold/php-src :
Call php_module_shutdown() for php-fpm child processes
2013-10-21 12:04:06 +02:00
9e4651f6f1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix typo
2013-10-20 17:56:14 -07:00
18cc5386de
Fix typo
2013-10-20 17:55:55 -07:00
Xinchen Hui