Commit Graph
597 Commits
Author SHA1 Message Date
Anatol Belski 28dbadeb1d Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (28 commits)
  substr_compare(): Allow zero length comparison
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
  primitive test fixes
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  remove pcntl leftover from the test code
  list the fpm change hat rfc in UPGRADING
  mention the apparmor support in fpm
  typo spotted by Lajos Veres
  update libs_version.txt
  update libs_version.txt
  NEWS
  NEWS
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
  fix tests broken by 633f898f15
  ...

Conflicts:
	ext/curl/interface.c
	ext/standard/mail.c
	ext/standard/string.c
2014-02-28 19:18:18 +01: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
Anatol Belski beb11f69f3 backported sapi/cli 2014-02-15 20:25:37 +01:00
Anatol Belski b923de2a8f Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/standard/html.c
2014-02-13 09:22:58 +01:00
Yasuo Ohgaki 9a5cb51ebc Merge branch 'PHP-5.6'
* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:56:54 +09:00
Yasuo Ohgaki cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Anatol Belski 4ff4837966 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend.c
	Zend/zend_ini_scanner.c
2014-01-04 02:17:11 +01:00
Xinchen Hui 0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08: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
Anatol Belski f58d0b35ed massive update semantical LONG vs INT replacements 2013-12-19 05:07:37 -08:00
Anatol Belski b1abe4ca21 mass replacement for zend_size_t/php_size_t 2013-12-18 14:46:44 -08:00
Anatol Belski 8432557dcd Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend.c
	Zend/zend.h
	Zend/zend_execute.h
	Zend/zend_vm_execute.h
	main/SAPI.h
2013-12-18 15:07:42 +01:00
Kalle Sommer Nielsen ed5a8d510f Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs 2013-12-18 09:06:39 +01:00
Kalle Sommer Nielsen e6b471933c Kill yet another TSRMLS_FETCH() inside the CLI HTTP server 2013-12-18 08:17:49 +01:00
Kalle Sommer Nielsen bd58146ad6 Kill another TSRMLS_FETCH() in the zend extension loading code 2013-12-18 07:59:47 +01:00
Anatol Belski 7266938012 use php_socket_t where possible in ext/cli 2013-12-13 22:16:12 +01:00
Anatol Belski f806f4d060 Merge branch 'master' into str_size_and_int64 2013-12-13 10:45:27 +01:00
Kalle Sommer Nielsen 1433dec2d0 Kill another TSRMLS_FETCH() in zend_indent() 2013-12-12 22:09:38 +01:00
Anatol Belski 27990438f1 Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend_builtin_functions.c
	ext/opcache/Optimizer/pass1_5.c
	ext/reflection/php_reflection.c
	ext/soap/soap.c
2013-12-10 19:46:40 +01: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
Anatol Belski 4c96b94873 Merge branch 'master' into str_size_and_int64 2013-11-26 19:09:31 +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
Anatol Belski c6adc039a1 more datatype fixes 2013-11-25 00:44:33 +01:00
Anatol Belski 51003463ef first shot for php-cgi for size_t and php_int_t 2013-11-21 13:26:56 +01:00
Anatol Belski fb27e16f01 fixed the skipif part 2013-11-21 11:54:35 +01:00
Anatol Belski 726d803375 fixed key length datatype 2013-11-19 14:51:20 +01:00
Anatol Belski f7bd3db224 Merge branch 'master' into str_size_and_int64 2013-11-19 13:42:51 +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
Anatol Belski 383ddcde2b Merge branch 'master' into str_size_and_int64 2013-11-18 09:10:22 +01: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
Anatol Belski 15bb12b269 fixed "struct stat" usage in main, cli and ext/standard 2013-11-13 12:39:12 +01: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
Anatol Belski 659d7ca634 fixed set process_title() 2013-10-16 03:14:16 -07:00
Anatol Belski 010b8114cc more for cli sapi 2013-10-16 03:05:13 -07:00
Anthony Ferrara e6f90ecc27 It compiles. Sort-of. In a way. Yeah. But nothing works. Sigh 2013-10-16 02:24:40 -07: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