Lior Kaplan
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
Lior Kaplan
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
Lior Kaplan
945938d33c
Update copyright year to 2014
2014-06-17 23:56:46 +03:00
Adam Harvey
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
Adam Harvey
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
Adam Harvey
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
Remi Collet
e2493a3a08
fix merge from php 5.5 (already fixed, differently)
2014-06-10 10:38:39 +02:00
Remi Collet
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
Remi Collet
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
Anatol Belski
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
Anatol Belski
9eb726b3ab
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:47:49 +02:00
Ferenc Kovacs
7446766dab
add missing skip to the output, so we actually skip this test
2014-04-07 16:57:52 +02:00
Remi Collet
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
Remi Collet
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
Remi Collet
b1df743b7a
man page: long option name is --strip, not --stripped
2014-02-28 08:12:03 +01:00
Remi Collet
c73b0543f1
--global have be removed in 5.2
2014-02-28 08:10:01 +01:00
Yasuo Ohgaki
cbd108abf1
Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:54:52 +09:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Ard Biesheuvel
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
Julien Pauli
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
Julien Pauli
ff20a9019d
Fixed a wrong test
2013-11-26 17:43:31 +01:00
Andrea Faulds
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
Andrea Faulds
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
Christopher Jones
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
Christopher Jones
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
Andrea Faulds
a3f5b9f62d
Rewrote test using tcp instead of http:// stream
2013-11-12 20:27:38 +00:00
Andrea Faulds
aee271ec0d
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
...
- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code
Conflicts:
NEWS
UPGRADING
2013-11-12 20:27:34 +00:00
Levi Morrison
73c44d6e6a
Fixed assumption that the temporary directory is located in /tmp
2013-10-11 22:18:07 +02:00
Anatol Belski
4fe7ec33f1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added fixed tests for ICU >= 51.2
fixed failing tests for ICU >= 51.2
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
2013-10-07 13:50:59 +02:00
Felipe Pena
93f3ba66a7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
2013-10-05 12:53:10 -03:00
Felipe Pena
3aaee86ee3
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
2013-10-05 12:52:55 -03:00
Anatol Belski
ac562b027b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 16:01:11 +02:00
Anatol Belski
8f146c2bb0
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
...
Patch by Pierre Renaudet
2013-09-20 15:59:33 +02:00
Christopher Jones
dcafcd01a9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:23:18 -07:00
Christopher Jones
dfa43d55dd
Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:22:50 -07:00
Michael Wallner
1c15d70cbd
Merge branch 'slim-postdata'
...
* slim-postdata:
slim post data
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
Adam Harvey
1ff81965c5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Handle CLI server request headers case insensitively.
5.4.21 now
2013-09-09 16:33:43 -07:00
Adam Harvey
8b6270271e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Handle CLI server request headers case insensitively.
5.4.21 now
Conflicts:
configure.in
main/php_version.h
2013-09-09 16:32:16 -07:00
Adam Harvey
3c3b2b5bdc
Handle CLI server request headers case insensitively.
...
Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
2013-09-09 16:24:49 -07:00
Michael Wallner
2438490add
slim post data
2013-08-27 13:31:35 +02:00
Christopher Jones
3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
Michael Wallner
4a9d7c1f00
add NEWS entry; add simple test
2013-08-06 22:51:58 +02:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Stanislav Malyshev
9cc9d32e6a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 17:01:43 -07:00
Lior Kaplan
f4b9b20b35
Add built-in web server to invocation list
2013-07-14 17:00:56 -07:00
Lior Kaplan
bcef0ebc2d
Terminology: change embedded web server to built-in web server to align with cli usage
2013-07-14 16:42:23 -07:00