mirror of
https://github.com/php/php-src.git
synced 2024-09-27 21:07:25 +00:00
f9927a6c97
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 |
||
---|---|---|
.. | ||
apache_config.c | ||
config.m4 | ||
config.w32 | ||
CREDITS | ||
mod_php5.c | ||
php5apache2.dsp | ||
php_apache.h | ||
php_functions.c | ||
php.sym | ||
README | ||
sapi_apache2.c |
WHAT IS THIS? This module exploits the layered I/O support in Apache 2.0. HOW DOES IT WORK? In Apache 2.0, you have handlers which generate content (like reading a script from disk). The content goes then through a chain of filters. PHP can be such a filter, so that it processes your script and hands the output to the next filter (which will usually cause a write to the network). DOES IT WORK? Currently the issues with the module are: * Thread safety of external PHP modules * The lack of re-entrancy of PHP. due to this I have disabled the 'virtual' function, and tried to stop any method where a php script can run another php script while it is being run. HOW TO INSTALL This SAPI module is known to work with Apache 2.0.44. $ cd apache-2.x $ cd src $ ./configure --enable-so $ make install For testing purposes, you might want to use --with-mpm=prefork. (Albeit PHP also works with threaded MPMs. See Thread Safety note above) Configure PHP 4: $ cd php-4.x $ ./configure --with-apxs2=/path/to/apache-2.0/bin/apxs $ make install At the end of conf/httpd.conf, add: AddType application/x-httpd-php .php If you would like to enable source code highlighting functionality add: AddType application/x-httpd-php-source .phps That's it. Now start bin/httpd. HOW TO CONFIGURE The Apache 2.0 PHP module supports a new configuration directive that allows an admin to override the php.ini search path. For example, place your php.ini file in Apache's ServerRoot/conf directory and add this to your httpd.conf file: PHPINIDir "conf" DEBUGGING APACHE AND PHP To debug Apache, we recommend: 1. Use the Prefork MPM (Apache 1.3-like process model) by configuring Apache with '--with-mpm=prefork'. 2. Start httpd using -DONE_PROCESS (e.g. (gdb) r -DONE_PROCESS). If you want to debug a part of the PHP startup procedure, set a breakpoint on 'load_module'. Step through it until apr_dso_load() is done. Then you can set a breakpoint on any PHP-related symbol. TODO PHP functions like apache_sub_req (see php_functions.c) Source Code Highlighting Protocol handlers