Marcus Boerger
af316021e8
- Rewrite scanner to be based on re2c instead of flex
...
The full patch is available as:
http://php.net/~helly/php-re2c-5.3-20080316.diff.txt
This is against php-re2c repository version 98
An older patch against version 97 is available under:
http://php.net/~helly/php-re2c-97-20080316.diff.txt
2008-03-16 21:06:55 +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
Jani Taskinen
aa3eee1dce
MFH:- Moved the old regex functions to own extension: ereg
2007-10-05 15:00:09 +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
fef2b33e85
MFH:- Fixed bug #42579 (apache_reset_timeout() does not exist)
2007-09-07 08:49:24 +00:00
Antony Dovgal
83e7324dae
fix build
2007-08-06 12:54:57 +00:00
Jani Taskinen
fc2fef68ac
- ws + sync apache2filter apache_config.c with the one from apache2handler
2007-08-03 09:32:34 +00:00
Stanislav Malyshev
c94dee8696
implement separate .htaccess stage
2007-08-03 01:14:44 +00:00
Jani Taskinen
eb923bf6fc
MFH: - Changed AC_ARG_* options to PHP_ARG_* options.
...
MFH: - Some cleanups here and there
MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
MFH: options)
# Note to Marcus: ext/dba/config.m4 needs to be "converted" to use
# the PHP_ARG_* options. I did't touch it needs quite a lot of work to keep
# it's current behaviour regarding "enabled-by-default" parts of it.
#
# Hint: By using the PHP_ARG_* options you have the "default" option.. ;)
2007-07-11 23:20:37 +00:00
Scott MacVicar
b73d2a94ae
Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3).
2007-06-18 15:52:46 +00:00
foobar
7bd41e0715
MFH:- Fixed bug #41576 (misbehaviour when using --without-apxs)
2007-06-03 20:27:16 +00:00
Marcus Boerger
50ea26760d
- Avoid sprintf, even when checked copy'n'paste or changes lead to errors
2007-02-24 02:17:47 +00:00
Stanislav Malyshev
e894206874
use snprintf
2007-02-23 21:38:25 +00:00
Sebastian Bergmann
4223aa4d5e
MFH: Bump year.
2007-01-01 09:36:18 +00:00
Antony Dovgal
46a6bd7f9d
MFH
2006-12-28 13:30:25 +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
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
Brian France
33879eceb3
Memory assigned to the request_rec should be allocated from apache pools
...
and should not be free'ed at the end of the handler phase
2006-10-12 20:02:58 +00:00
Nuno Lopes
47713b1eb7
more int->zend_bool conversions
2006-09-06 11:54:29 +00:00
Dmitry Stogov
29e1530cd7
Added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs
2006-08-03 09:56:50 +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
Rasmus Lerdorf
6fb0bf80ea
Switch to a signed int for now. Will look at moving to a long throughout
...
the code here.
2006-05-13 21:50:28 +00:00
Rasmus Lerdorf
4df7ab403c
Add input_filter hook call in getenv()
2006-05-10 21:19:32 +00:00
Edin Kadribasic
af11e1d592
Correctly import external data ( #33292 )
2006-04-26 09:31:23 +00:00
Ilia Alshanetsky
46ba651680
MFH:
...
Removed extra space in the Content-Type header for logos
Simplified stderr error reporting in apache sapi.
2006-04-02 17:58:17 +00:00
Antony Dovgal
8068342483
MFH: fix #36400 (Custom 5xx error does not return correct HTTP response error code)
2006-02-15 11:09:05 +00:00
Rasmus Lerdorf
4d64a617c3
MFH: I don't recall the reason for messing with r->allowed here, so let's
...
get rid of it (and see who screams). This should fix bug #32561
2006-01-06 18:06:38 +00:00
foobar
5bd93221a8
bump year and license version
2006-01-01 12:51:34 +00:00
Andrei Zmievski
e6ae0e99c3
MFH
2005-12-16 22:45:12 +00:00
foobar
3e669bc950
MFH: nuke php3 legacy
2005-12-06 02:28:41 +00:00
foobar
b9af8f2719
MFH: nuke php3 legacy
2005-12-06 01:14:02 +00:00
Antony Dovgal
e5928942ac
MFH: initialize SG(request_info).auth_digest
2005-10-18 23:51:54 +00:00
Ilia Alshanetsky
24046edbbb
MFH: Fixed bug #34905 (Digest authentication does not work with Apache 1).
2005-10-18 23:15:28 +00:00
foobar
23e671a51e
- Bumber up year
2005-08-03 14:08:58 +00:00
Dmitry Stogov
cf6bb99723
Fixed bug #33723 (php_value overrides php_admin_value)
2005-08-01 07:46:54 +00:00
Brian France
3137e1e422
Added a SG(server_context) NULL check to php_apache_getenv.
...
This can get called when "<key> = ${<key>}:/foo" is used in a .ini file, but <key> has not be set yet.
You will end up with a value of ":/foo", but at least it will not crash now.
2005-06-28 16:34:18 +00:00
Antony Dovgal
8be61d707f
fix #29683 (headers_list() returns empty array)
2005-06-20 12:46:34 +00:00
foobar
a20383ba06
- Unify the "configure --help" texts
2005-05-29 23:17:16 +00:00
Rasmus Lerdorf
091bff3570
Fix for bug #33057 - Don't send extraneous entity-headers on a 304 as per
...
RFC 2616 section 10.3.5
2005-05-19 15:57:45 +00:00
foobar
0e57528666
No c++ comments in C code
2005-04-19 11:41:04 +00:00
Rui Hirokawa
8235a70ef9
added a server variable PHP_AUTH_DIGEST to support HTTP Digest Authentication.
2005-04-04 15:06:36 +00:00
Rasmus Lerdorf
3c0411c496
Fix for bug #32263
...
This adds proto_num to request_info. It is defaulted to HTTP 1.0 (1000)
such that it has a valid value even if the underlying sapi doesn't set it
correctly. It is then used to determine if a 302 or a 303 should be sent
on a Location redirect. Any non GET/HEAD HTTP 1.1 redirect will get a 303
instead of a 302 to be compatible with the HTTP spec.
2005-03-14 19:25:39 +00:00
foobar
4c883c79bb
Do not set apache stuff if not building apache
2005-03-04 15:14:47 +00:00
Derick Rethans
7b27263e16
- There is no --with-apache2, only apxs2
2005-01-26 18:03:04 +00:00
Rasmus Lerdorf
3d297bf881
Fix proto
2004-12-04 13:47:13 +00:00
Rasmus Lerdorf
224d2479b3
Add apache_reset_timeout() function for Apache1. This is needed because
...
Apache1 only resets the write timer, which defaults to 300 seconds, on
a successful write. That is, if the client has gone away and Apache
attempts a write which fails it will set the conn->aborted flag but not
reset the timeout. Assuming the PHP script is running in ignore_user_abort
mode we ignore the aborted flag, but we'll still get blown out of the water
300 seconds after the failed write unless we periodically reset the timer.
With set_time_limit(0), ignore_user_abort(true) and periodic
apache_reset_timeout() calls we can theoretically run forever which is
why I disabled this call in safe mode.
2004-12-04 07:16:44 +00:00
Antony Dovgal
ad503c814b
MFB: typo in config.m4 (potential configuration problem with Stronghold)
2004-08-18 07:22:54 +00:00
Rasmus Lerdorf
cad60c3760
Add SAPI hook to get the request time if provided by the web server,
...
otherwise call time(0) on the first call and store it so subsequent
calls will get the same time. Hook support for Apache1/2 included.
2004-08-10 17:40:00 +00:00
Andi Gutmans
56f8195fe5
- Nuke empty_string. It is a reminanent from the time where RETURN_FALSE()
...
used to return "" and not bool(false). It's not worth keeping it because
STR_FREE() and zval_dtor() always have to check for it and it slows down
the general case. In addition, it seems that empty_string has been abused
quite a lot, and was used not only for setting zval's but generally in
PHP code instead of "", which wasn't the intention. Last but not least,
nuking empty_string should improve stability as I doubt every place
correctly checked if they are not mistakenly erealloc()'ing it or
calling efree() on it.
NOTE: Some code is probably broken. Each extension maintainer should
check and see that my changes are OK. Also, I haven't had time to touch
PECL yet. Will try and do it tomorrow.
2004-07-19 07:19:50 +00:00
Stefan Esser
446f4d1bc2
Security Fix broken! Destroyed Basic auth. Blame: me
...
4.3.x not affected
2004-07-14 09:43:26 +00:00
Andi Gutmans
e5cfb1d05c
- Better stability during premature shutdown of request startup
2004-07-10 07:46:17 +00:00
Rasmus Lerdorf
44df89f00d
MFB - see bug #25753 for details
2004-01-28 17:49:49 +00:00
foobar
f4983c0d3f
- Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5
2004-01-17 13:00:38 +00:00
foobar
ccfc46b0aa
- Happy new year and PHP 5 for rest of the files too..
...
# Should the LICENSE and Zend/LICENSE dates be updated too?
2004-01-08 17:33:29 +00:00
Andi Gutmans
dbeb4158d2
- A belated happy holidays and PHP 5
2004-01-08 08:18:22 +00:00
Wez Furlong
331dc79254
More things for the new build system.
...
Pi3Web and aolserver build untested (no headers and libs for those here)
2003-12-19 20:39:04 +00:00
Wez Furlong
a5cf836260
Fix libxml to use static lib if found.
...
Disable apache and isapi by default.
Add some smarts so that we can really build extensions and SAPI found in php-src/pecl and/or php-src/../pecl.
Only include a logo in the resources if we are building an .exe.
2003-12-04 13:38:47 +00:00
Wez Furlong
ad84dfa937
Build adjustments.
2003-12-03 14:29:45 +00:00
Wez Furlong
34df2ae239
some tweaks for Frank
2003-12-03 02:47:45 +00:00
Wez Furlong
0e0f78df63
Fix build if you don't have apache headers and want to disable apache...
2003-12-03 00:27:44 +00:00
Wez Furlong
05b9b20ed8
Add new (optional!) win32 build infrastructure.
...
Will follow up to internals@ shortly.
2003-12-02 23:17:04 +00:00
Ilia Alshanetsky
d62c9f33d9
regex_t is used by both Apache & mbregex. This little check prevent compile
...
failure, while php is compiled as dso module & mbstring is enabled.
2003-09-17 05:42:08 +00:00
foobar
1aa5bab89c
Nuke warning
2003-09-09 21:38:31 +00:00
foobar
0c0d3a41d1
fix typo
2003-09-09 21:34:12 +00:00
foobar
f04643ee4c
Show the runtime version of Apache instead of compile time.
2003-09-09 21:30:48 +00:00
Ilia Alshanetsky
21d5061038
Fixed format bug
2003-08-28 17:48:58 +00:00
foobar
3a7ca909be
- HAVE_OPENSSL_EXT is not defined always.
2003-06-27 16:41:41 +00:00
Edin Kadribasic
f58cc5d28a
Fixed win32 build (mod_php4 -> mod_php5)
2003-06-15 11:36:02 +00:00
James Cox
f68c7ff249
updating license information in the headers.
2003-06-10 20:04:29 +00:00
Rasmus Lerdorf
a516171dec
MFB - fix a couple of missing closing folding tags
2003-06-03 05:44:17 +00:00
foobar
dcb0daeae3
- Fix the error message if apxs|2 is fubar.
2003-05-28 14:11:21 +00:00
Moriyoshi Koizumi
f3b050fba1
Fixed a syntax highlighter problem that happens when output buffering is turned
...
on
2003-05-16 23:08:23 +00:00
Edin Kadribasic
d758f2ea0b
Reverting my last patch because user reports it does not help
...
solve the problem. (bug #23504 )
2003-05-09 09:11:14 +00:00
Edin Kadribasic
97f3a35d73
Fixed MFB side effect
2003-05-08 14:42:31 +00:00
Edin Kadribasic
6f0e0a61b6
MFB
2003-05-08 09:27:18 +00:00
Sascha Schumann
d26e1b751c
Merge proper -I parameter for APXS builds
2003-03-30 18:36:04 +00:00
Sterling Hughes
3f700e58ab
update php module name to php5, not php4.
...
apache, apache2* and cli/cgi work.
sapi module maintainers should fix up their sapis, as I don't run
any servers with php outside of apache.
2003-03-29 04:52:46 +00:00
Sebastian Bergmann
5ca078779a
Eliminate some TSRMLS_FETCH() calls. Tested with Win32 build of SAPI/CGI and SAPI/CLI on Win32.
2003-03-25 08:07:13 +00:00
Stig Bakken
0e6fca4f22
* email address change
2003-03-18 12:06:09 +00:00
foobar
3c9155e0cb
Renamed OnUpdateInt -> OnUpdateLong to prevent further misunderstandings.
...
# Intentionally left out any 'alias' for it, this way 3rd party extension
# maintainers will really NOTICE the change.
2003-03-07 05:15:28 +00:00
foobar
73bae37f26
Possible fix for #22259 + part 1/2 for fixing one AIX bug..
2003-02-24 16:16:11 +00:00
George Schlossnagle
e49bc59a79
ws fix
2003-02-24 01:25:30 +00:00
George Schlossnagle
f5fb75f390
hopefully a fix for 19919
2003-02-24 01:19:08 +00:00
foobar
58e4503942
Added missing headers and $Id$ tags.
2003-02-23 09:50:43 +00:00
foobar
6000c7b46c
- Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT)
2003-02-23 07:32:03 +00:00
David Viner
1cf1e31acc
this tiny change adds the location of apache includes and libraries that
...
are installed when you use the Apache Windows Installer
(C:\Program Files\Apache Group\Apache\*). With this patch,
a windows developer who has used the Apache Windows Installer should be
able to compile the Apache sapi module without any modifications to his/her
installed tree. It should have no effect whatsoever on anyone else.
--dviner
2003-02-21 00:14:33 +00:00
Zeev Suraski
4934744b93
Win32 build improvements
2003-02-17 13:29:59 +00:00
foobar
2f2f6739b4
Added HAVE_APACHE define.
2003-02-13 07:47:21 +00:00
foobar
e337c5d1c6
Fixed the "member fd in BUFF" test for --with-apxs builds
2003-02-12 17:09:31 +00:00
Sascha Schumann
fa6d2d48c5
move check to proper place
2003-02-11 02:34:52 +00:00
Sascha Schumann
67f18fcf6c
Detect whether BUFFs contain a fd element. IBM is hiding the actual
...
descriptor behind a void *, so we just disable this for IBM servers
2003-02-11 02:23:29 +00:00
Sascha Schumann
ba32a619ae
use SUCCESS/FAILURE instead of 0/-1
2003-02-09 21:15:55 +00:00
Ilia Alshanetsky
acc9c13c36
Build Fix.
2003-02-05 00:41:40 +00:00
Ilia Alshanetsky
13f8b211c4
Fixed compilation of Apache & Apache Hooks SAPIs.
2003-02-04 20:54:17 +00:00
Zeev Suraski
3a1a209baf
Updates reflecting infrastructure changes
2003-02-04 13:12:48 +00:00
Ilia Alshanetsky
8a9e09a44a
ARG_COUNT(ht) -> ZEND_NUM_ARGS().
2003-01-21 14:56:40 +00:00
Sascha Schumann
294e776d95
add sapi_get_target_uid/_gid for obtaining information about the
...
non-privileged user the web server is running as. this is useful
for creating shared memory segments which need to be accessed by
the child processes/threads.
2003-01-21 11:03:58 +00:00
Ilia Alshanetsky
c794f2c710
Removed pointless memory allocation checks.
2003-01-18 20:27:05 +00:00