4e2c87edb3
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:43:23 +08:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
5065505c93
Fix bug #68784
2015-01-09 18:09:13 -08:00
27ff425b78
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/tests/php_cli_server.inc
2015-01-06 01:27:37 +00:00
448ef30f75
Handle NULL strings in sapi_cli_server_register_variable().
...
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
2015-01-06 01:23:27 +00:00
0cc2810498
Allow CLI server test scripts to specify the name of the router file.
...
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
2015-01-06 01:22:59 +00:00
2a73d56ef9
Fix php cli (-S option) inconsistent port parsing
...
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
2014-11-30 22:42:12 -08:00
a87300241f
Fix php cli (-S option) inconsistent port parsing
...
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
2014-11-30 22:29:24 -08:00
7e4b77c921
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test with readline on mac
2014-11-29 01:49:23 +01:00
108bf84967
fix test with readline on mac
2014-11-29 01:47:45 +01:00
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
16b4167fdd
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-27 02:18:29 +02:00
e6105ffb22
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-27 02:17:52 +02:00
2711948d14
This test should pass
2014-09-27 02:17:26 +02:00
e02616866f
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:38 +02:00
e9166fec62
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:16 +02:00
4e3d9a52ac
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 15:09:47 +08:00
1684ba3c6f
Fix #67594 - invisible colon should be stripped off header name
2014-07-12 12:45:50 +08:00
70e9d3e2f9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
2014-07-07 20:45:01 +00:00
1939b34c78
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
2014-07-07 20:40:47 +00:00
604de67b7d
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
...
We had an infinite loop in sapi_cli_server_send_headers(): while iterating over
the linked list of headers, when an empty header was hit, continue would go to
the next iteration of the loop without updating h to be the next value in the
linked list. Updating it to always increment regardless of whether the header
is actually valid or not fixes the issue.
2014-07-07 20:36:06 +00:00
b0b47a2064
Update copyright year to 2014
2014-06-18 00:18:47 +03:00
1222f51ebd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
2014-06-18 00:14:18 +03:00
d2bdedbcfc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
2014-06-18 00:11:35 +03:00
945938d33c
Update copyright year to 2014
2014-06-17 23:56:46 +03:00
e082199d8e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add 308 and 426 to the HTTP response code map in the CLI server.
2014-06-12 17:57:36 -07:00
e956ba9357
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add 308 and 426 to the HTTP response code map in the CLI server.
2014-06-12 17:56:10 -07:00
fe67674809
Add 308 and 426 to the HTTP response code map in the CLI server.
...
Implements FR #67429 (CLI server is missing some new HTTP response codes).
2014-06-12 17:54:29 -07:00
e2493a3a08
fix merge from php 5.5 (already fixed, differently)
2014-06-10 10:38:39 +02:00
d440bb3e68
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
2014-06-10 10:32:26 +02:00
58c6a08e00
Fixed bug #67406 built-in web-server segfaults on startup
...
Reproduce on aarch64.
From select man page:
"select() may update the timeout argument to indicate how much time was left."
So "const" is not ok.
2014-06-10 10:28:34 +02:00
b4c238c8cf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:48:31 +02:00
9eb726b3ab
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:47:49 +02:00
7446766dab
add missing skip to the output, so we actually skip this test
2014-04-07 16:57:52 +02:00
06feb15a16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2
2014-02-28 08:12:26 +01:00
5fc7382a57
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2
2014-02-28 08:12:16 +01:00
b1df743b7a
man page: long option name is --strip, not --stripped
2014-02-28 08:12:03 +01:00
c73b0543f1
--global have be removed in 5.2
2014-02-28 08:10:01 +01:00
cbd108abf1
Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:54:52 +09: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
f33265d572
cli: don't cast away const in select() timeout argument
...
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]
Fix this by passing a stack copy of the timeout argument to select()
2013-12-09 16:54:42 +01:00
aa33da6a51
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed a wrong test
2013-11-26 17:43:45 +01:00
ff20a9019d
Fixed a wrong test
2013-11-26 17:43:31 +01:00
35b463a2c5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Removed UPGRADING note
Rewrote test using tcp instead of http:// stream
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:43:59 +00:00
9937e2fda5
Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5
...
* CLIGetAllHeadersBackport:
Removed UPGRADING note
Rewrote test using tcp instead of http:// stream
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:19:07 +00:00
419bef3070
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
This is CLI web server change. Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that. Ref http://news.php.net/php.internals/69990
2013-11-15 12:37:17 -08:00
d0cd112702
This is CLI web server change. Added some common MIME types to the
...
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that. Ref http://news.php.net/php.internals/69990
A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php
2013-11-15 12:36:25 -08:00
a3f5b9f62d
Rewrote test using tcp instead of http:// stream
2013-11-12 20:27:38 +00:00
Reeze Xia