archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
76777 commits 526 branches 1434 tags 877 MiB
Commit graph

573 commits

Author SHA1 Message Date
Reeze Xia
34f09b6240 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:25:30 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Rasmus Lerdorf
e4b3d623a2 Fix bug #68784 2015-01-09 18:08:36 -08:00
Adam Harvey
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
Adam Harvey
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
nil0x42
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
Ferenc Kovacs
108bf84967 fix test with readline on mac 2014-11-29 01:47:45 +01:00
Johannes Schlüter
e6105ffb22 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-27 02:17:52 +02:00
Johannes Schlüter
2711948d14 This test should pass 2014-09-27 02:17:26 +02:00
Remi Collet
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
Tjerk Meesters
1684ba3c6f Fix #67594 - invisible colon should be stripped off header name 2014-07-12 12:45:50 +08:00
Adam Harvey
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
Adam Harvey
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
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
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
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
9eb726b3ab Fixed bug #67079 Missing MIME types for XML/XSL files 2014-04-16 09:47:49 +02: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
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
Julien Pauli
ff20a9019d Fixed a wrong test 2013-11-26 17:43:31 +01: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
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
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
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
dfa43d55dd Added application/pdf to PHP CLI Web Server mime types. 2013-09-19 20:22:50 -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
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
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
Lior Kaplan
07501dc1a2 Align -B and -E parameter names with cli usage (begin_code and end_code) 2013-07-14 16:42:09 -07:00
Remi Collet
1aeb2514fe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo in php man page
 2013-07-02 12:19:37 +02:00
Remi Collet
67817a199c fix typo in php man page 2013-07-02 12:19:09 +02:00
Remi Collet
8f0567581e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
 2013-07-02 10:47:38 +02:00
Remi Collet
c940aab789 Fixed Bug #65143 Missing php-cgi man page 
Currently php-cgi man page is a simple redirect to
php (CLI) man page.

Could be splited / improved in the future.
 2013-07-02 10:42:47 +02:00
Adam Harvey
77c46ba516 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
 2013-06-20 09:39:37 -07:00
Adam Harvey
f5c7fe9202 Fix the spelling of the php_cli_server_http_response_status_code_pair typedef. 
Specifically: php_cli_server_http_reponse_status_code_pair →
php_cli_server_http_response_status_code_pair.
 2013-06-20 09:34:21 -07:00
Adam Harvey
283f56af66 Change the search in get_status_string() to correctly handle unknown codes. 
This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.

There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.

Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).
 2013-06-20 09:31:57 -07:00
Nuno Lopes
e769025791 leave a sane environment behind (even if empty) when exiting 
some OS atexit() handlers call getenv()
 2013-04-07 02:33:33 -04:00