Commit Graph
3054 Commits
Author SHA1 Message Date
Anatol Belski 3f7522a652 Merge branch 'master' into str_size_and_int64 2013-11-28 09:29:12 +01:00
George Wang 9960ecc5cd update to LSAPI 6.6 2013-11-26 18:53:35 -05: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 8e50280163 updated datatypes in apache handler globals 2013-11-25 18:06:09 +01:00
Anatol Belski c6adc039a1 more datatype fixes 2013-11-25 00:44:33 +01:00
Anatol Belski 52afd818eb fixed apache2 handler 2013-11-22 11:39: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 ad675f6ac2 Merge branch 'master' into str_size_and_int64
Conflicts:
	main/php_version.h
2013-11-09 11:03:04 +01:00
George Wang 01bc13212e Update LiteSpeed SAPI code to V6.4 2013-11-05 16:14:49 -05:00
George Wang 3720fd77b5 Fixed typo in Makefile.frag 2013-11-05 16:12:24 -05:00
Anatol Belski c675980046 Merge branch 'pull-request/500'
* pull-request/500:
  limit virtual_cwd_activate() duplicated call to ZTS only
  reverted the previous commit, both calls are needed in TS mode
  virtual_cwd_activate() should be called only in one place
  back to do_alloca()
  removed unnecessary call
  simplify the state free macros
  compact the code to preserve the error info after state freeing
  back to do_alloca(), reverted the wrong replacement
  enabled windows to use stack in both ts/nts mode, some more fixes
  moved to do_alloca() usage where appropriate
  fixed invalid free
  fixed virtual cwd header in phar
  updated NEWS
  fixed all the places where last error could be lost
  preserve the error code
  applied and fixed the original patch
  initial move on renaming files and fixing includes

Conflicts:
	ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
Anatol Belski e243a26b4c Merge branch 'master' into str_size_and_int64
* master: (30 commits)
  Fixed coredump due to abnormal implemention of phar
  Fix English here
  Fix bug #66008
  Removed unnecessary GC checks
  Add crypt() change in UPGRADING
  Fix bug #65997 by switching to Serializable for GMP
  Fix compile warning in GMP
  Fix ZTS build
  updated libs_versions.txt
  Implemented Change crypt() behavior w/o salt RFC
  Update NEWS
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
  add bundled libzip LICENSE, as required by BSD License terms
  Avoid copy in func_get_arg()
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  ...

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-11-04 09:19:52 +01:00
Rasmus Lerdorf a0244a69cc Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #66008
2013-10-31 03:18:36 -07:00
Rasmus Lerdorf 812dfbc431 Fix bug #66008 2013-10-31 03:18:07 -07:00
Antony Dovgal 09ad5fbbb3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:46:40 +04:00
Anatol Belski 3889019638 Merge branch 'master' into str_size_and_int64
* master:
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  - test3
  - test commit 2
  - test commit1
2013-10-28 09:10:55 +01:00
Michael Wallner 8962f3ff0c fix limitation of upload size == (U)INT_MAX in CGI 2013-10-28 07:37:47 +01:00
Antony Dovgal 73788d1c23 Merge branch 'PHP-5.5'
* PHP-5.5:
  increase backlog to the highest value everywhere
2013-10-27 22:57:31 +04:00
Antony Dovgal 9765763413 increase backlog to the highest value everywhere
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
2013-10-27 22:54:47 +04:00
Anatol Belski 4fc7dc6eae Merge branch 'master' into str_size_and_int64
* master: (79 commits)
  ldap_escape() notes
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
  Added a LICENSE file to make it easier for PECL binary distributions to conform with the license.
  Fix Coverity issue reporting wrong sizeof()
  Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
  exif NEWS
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
  fix bug #65936 (dangling context pointer causes crash)
  remove TRAVIS check in test source
  Fixed compilation warning
  Just SKIP that test on travis
  Fixed issue #115 (path issue when using phar).
  fix memory leak on error (from Coverity scan)
  fix argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  ...

Conflicts:
	Zend/zend_compile.c
	ext/intl/collator/collator_create.c
	ext/intl/locale/locale_methods.c
	ext/intl/msgformat/msgformat_format.c
	ext/intl/msgformat/msgformat_parse.c
2013-10-25 04:19:27 -07:00
Anatol Belski 8591a52fab fixed invalid free 2013-10-21 11:15:31 -07:00
Michael Wallner 454a9fcb14 Merge branch 'master' of https://github.com/guggemand/php-src
* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq
2013-10-21 12:04:37 +02:00
Michael Wallner 41da537614 Merge branch 'master' of https://github.com/DylanArnold/php-src
* 'master' of https://github.com/DylanArnold/php-src:
  Call php_module_shutdown() for php-fpm child processes
2013-10-21 12:04:06 +02:00
Rasmus Lerdorf 7ccffeea75 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix typo
2013-10-20 17:56:24 -07:00
Rasmus Lerdorf 9e4651f6f1 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix typo
2013-10-20 17:56:14 -07:00
Rasmus Lerdorf 18cc5386de Fix typo 2013-10-20 17:55:55 -07:00
Rasmus Lerdorf 12aa4aa61c Merge branch 'PHP-5.5'
* PHP-5.5:
  Initialize these to make Coverity happy
  Typo fix: managment -> management
  Use minus sign instead of hyphen
  Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 17:42:36 -07:00
Rasmus Lerdorf 26b27767a6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Initialize these to make Coverity happy
  Typo fix: managment -> management
  Use minus sign instead of hyphen
  Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 17:41:04 -07:00
Rasmus Lerdorf 813e867652 Initialize these to make Coverity happy 2013-10-19 17:37:59 -07:00
Lior Kaplan a55d3b9295 Typo fix: managment -> management 2013-10-19 23:53:23 +03:00
Lior Kaplan df501fd464 Use minus sign instead of hyphen 2013-10-19 23:52:43 +03:00
Anatol Belski 659d7ca634 fixed set process_title() 2013-10-16 03:14:16 -07:00
Anatol Belski 832e9653d1 fix build 2013-10-16 03:09:49 -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