Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Nikita Popov
2d212b426a
Drop duplicate arg from hash_get_current_key_ex
2014-12-26 21:06:18 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Nikita Popov
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
Florian MARGAINE
8eb7e7bf7f
Merge branch 'master' into issue-67910
...
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Pierre Joye
e9eb642a36
fix hash API calls
2014-05-17 08:12:18 +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
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Michael Wallner
8b9d12dd47
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix some warnings
PHP-5.6 compatibility for apache2 filter SAPI
Fixes bug #66595
2014-03-24 17:53:08 +01:00
Michael Wallner
caba0203e8
fix some warnings
2014-03-24 17:51:50 +01:00
Michael Wallner
275b2c420d
PHP-5.6 compatibility for apache2 filter SAPI
2014-03-24 17:48:28 +01: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
Kalle Sommer Nielsen
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
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Felipe Pena
2019062cfc
- Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
2012-07-08 14:05:28 -03:00
Christopher Jones
15cd45e95e
Fixed bug #61172 (Add Apache 2.4 support)
2012-03-02 00:07:41 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Xinchen Hui
d4b90b4788
Fixed bug #60206 (possible integer overflow in content_length)
2011-11-03 07:26:09 +00:00
Felipe Pena
32b5f8a1a3
- Added new parameter parsing option (p - for valid path (string without null byte in the middle))
...
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
Ilia Alshanetsky
f89effd2a8
Updated _SERVER['REQUEST_TIME'] to include microsecond precision.
2010-11-06 17:14:21 +00:00
Kalle Sommer Nielsen
34b631f679
Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's
2010-08-18 13:34:40 +00:00
Kalle Sommer Nielsen
dd8e59da8f
Removed safe_mode
...
* Removed ini options, safe_mode*
* Removed --enable-safe-mode --with-exec-dir configure options on Unix
* Updated extensions, SAPI's and core
* php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Rasmus Lerdorf
1947334023
Fix bug #50940
2010-02-05 18:59:05 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Ilia Alshanetsky
f0240a0382
MFB: Improved parameter handling
2009-01-05 16:24:26 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Stanislav Malyshev
40cd1d49b3
MFH fix #46005
2008-12-17 11:34:50 +00:00
Felipe Pena
fc2fb50d09
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-11-17 11:28:01 +00:00
Arnaud Le Blanc
aaaf67e19e
Updated header_handler in apache2filter and apache_hooks
2008-11-13 13:41:08 +00:00
Alexey Zakhlestin
f9d86cf9d3
new parameter-parsing API
2008-11-07 13:28:23 +00:00
Felipe Pena
7a37fa2d6b
- Revert ZEND_BEGIN_ARG_INFO change
2008-11-02 21:19:39 +00:00
Felipe Pena
cc9a286005
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-10-24 16:03:15 +00:00
Jani Taskinen
b17dc14f18
MFH: nuketh C++ comments
2008-08-03 12:15:55 +00:00
Felipe Pena
b22f47ee30
- Added arginfo
2008-07-20 14:28:41 +00:00
Scott MacVicar
35c58958a2
Fix compile error due to the removal of fteller on streams.
2008-07-18 13:08:08 +00:00
Elizabeth Marie Smith
7d4dfa8ee4
Windows configure fixes, a few additional lib names allowed, apache2 only on for zts builds since apache on win is always threaded, isapi no longer stops configure in non-zts mode, look for _debug for debug libraries when debug is enabled
2008-05-14 03:13:17 +00:00
Rasmus Lerdorf
45e327a672
Add new empty child terminate sapi hook to the rest of the sapis
2008-03-18 22:23:21 +00:00
Lars Strojny
a344adf72e
sapi/apache2(handler|filter)/config.m4: Removing itk from the list of threaded MPMs (thanks Hannes)
2008-03-09 12:35:56 +00:00
Lars Strojny
1b16b4e243
Adding itk and and peruser MPM to the list of threaded Apache MPMs
2008-03-09 01:10:25 +00:00
Dmitry Stogov
240fa244c3
Improved PHP binary size and startup speed with GCC4 visibility control (Nuno)
2008-01-30 09:41:12 +00:00
Sebastian Bergmann
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
Dmitry Stogov
6c810b0d4c
Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)
2007-09-27 18:00:48 +00:00
Jani Taskinen
77f9d22a0e
- Sync with apache2handler
2007-08-03 09:33:30 +00:00