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
Jeff Trawick
442264ffd6
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:36:43 -07:00
Bob Weinand
99d1a1bb3f
Shut up, my lovely compiler; I do not like your warnings
2014-04-11 19:33:56 +02:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -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
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
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Xinchen Hui
d7d0d0724c
Fixed bug #60206 (possible integer overflow in content_length)
2011-11-03 07:26:09 +00:00
Xinchen Hui
d4b90b4788
Fixed bug #60206 (possible integer overflow in content_length)
2011-11-03 07:26:09 +00:00
Ilia Alshanetsky
7f2882cc53
Fixed a bug with calculation of REQUEST_TIME in apache2
2011-06-23 14:12:50 +00:00
Ilia Alshanetsky
86c44e119f
Fixed a bug with calculation of REQUEST_TIME in apache2
2011-06-23 14:12:50 +00:00
Rasmus Lerdorf
27dd44db95
Fix a couple of warnings. Use %zu to printf a time_t and get_request_time
...
actually returns a double, not a time_t.
2011-05-16 15:52:31 +00:00
Rasmus Lerdorf
e0df4e3dba
Fix a couple of warnings. Use %zu to printf a time_t and get_request_time
...
actually returns a double, not a time_t.
2011-05-16 15:52:31 +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
Rob Richards
60f62fc563
fix non-windows builds
2010-05-04 12:12:28 +00:00
Pierre Joye
56e327ba27
- revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only)
2010-05-03 19:51:59 +00:00
Pierre Joye
d90f8560aa
- #51273 , Content-length header is limited to 32bit integer with apache2/windows
2010-05-03 17:47:58 +00:00
Pierre Joye
9720dea2c7
- WS
2010-05-03 14:30:14 +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
Jani Taskinen
bf7ed5eff5
- Fixed bug #49677 (ini parser crashes with apache2 and using ${something} ini variables)
2009-11-25 12:35:42 +00:00
Jani Taskinen
afc44b981e
ws
2009-11-25 12:26:10 +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
Arnaud Le Blanc
8c4151ad72
Added header_remove() (chsc at peytz dotdk, Arnaud)
...
[DOC] proto void header_remove([string header_name])
Removes an HTTP header previously set using header()
The header_name parameter is optionnal, all headers are
removed if it is not set
[SAPIs] The header_handler callback in sapi_module_struct has
been changed, it now take a new argument.
When it is set to SAPI_HEADER_DELETE, sapi_header->header is
the name of an header, header_handler has to delete it.
When it is set to SAPI_HEADER_DELETE_ALL, header_handler has
to delete all headers.
When sapi_header_op_enum is SAPI_HEADER_ADD or _REPLACE,
sapi_header->header is in the form "Name: value", header_handler
has to add or replace the given header.
In all cases, header_handler must not free sapi_header or
sapi_header->header. SAPI_HEADER_ADD must be returned if the
header has been added or replaced, or 0 in other cases.
2008-11-13 10:14:04 +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
Ilia Alshanetsky
1227a4c57a
Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
...
response)
2008-01-16 15:49:46 +00:00
Sebastian Bergmann
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
Antony Dovgal
37e0738f3a
MFH
2007-06-28 17:23:07 +00:00
Antony Dovgal
6d76fc2834
MFH: fix #39330 (apache2handler does not call shutdown actions before apache child die)
2007-06-01 10:04:06 +00:00
Sebastian Bergmann
4223aa4d5e
MFH: Bump year.
2007-01-01 09:36:18 +00:00
Dmitry Stogov
53b088e60c
Make MEMORY_LIMIT and ZEND_USE_MALLOC_MM to be always enabled. They don't make any significant slowdown, but incrise maintainability a lot. Note that the setting of memory_limit wasn't changes (neither in main/main.c nor in php.ini) and it still set to 16M.
2006-12-20 10:49:33 +00:00
Ilia Alshanetsky
1c4806c515
Fixed bug #39201 (Possible crash in Apache 2 with 413 ErrorHandler).
2006-12-13 00:41:33 +00:00
Ilia Alshanetsky
cbaaf1bc07
Fixed bug #39797 (virtual() does not reset changed INI settings).
2006-12-12 18:05:25 +00:00
Ilia Alshanetsky
b3006ed2a5
Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
...
ErrorDocument).
2006-11-09 19:10:13 +00:00
Ilia Alshanetsky
e5f9b479af
Fixed bug #38602 (header( "HTTP/1.0 ..." ) does not change proto version).
2006-11-09 00:13:26 +00:00
Ilia Alshanetsky
6123f11021
MFH:
...
Added filter support for $_SERVER in cgi/apache2 sapis
Make sure PHP_SELF is filtered in Apache 1 sapi
2006-11-03 13:51:48 +00:00
Antony Dovgal
1ec10ac8c7
typos in comments and other minor improvements
2006-08-10 13:43:18 +00:00
Stanislav Malyshev
0617904d0a
fix bug with variables clobbered by longjmp
2006-08-08 13:34:14 +00:00
Antony Dovgal
5e0f6ea7db
nuke unused variable
2006-07-26 10:31:08 +00:00
Dmitry Stogov
356facf4af
Changed memory_get_usage() and memory_get_peak_usage(). Optional boolean argument allows get memory size allocated by emalloc() (by default) or real size of memory allocated from system.
2006-07-25 13:40:05 +00:00
Dmitry Stogov
29ed52ffa4
New memory manager
2006-07-18 09:06:33 +00:00
Michael Wallner
d724f9cfb1
MFH: call ap_set_content_type() only once, else each time we call it,
...
configured output filters for that content type will be added
2006-05-28 20:32:00 +00:00