php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,803 Commits 547 Branches 1,481 Tags
8ce23d8f4fc5df0daec05642df8ead016f00fc32
Commit Graph

613 Commits

Author SHA1 Message Date
Dmitry Stogov
b108267f2c Merge branch 'master' into phpng 
* master: (41 commits)
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  fix failed test
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
  Added tests for bug 67436
  Fixed wrong XFAIL test - already fixed
  Fix typo in Bug #67406 NEWS entry
  Fix typo in Bug #67406 NEWS entry
  ...

Conflicts:
	Zend/zend_compile.c
	ext/session/session.c
	ext/standard/array.c
	ext/standard/http_fopen_wrapper.c
	tests/classes/bug63462.phpt
 2014-06-18 17:50:27 +04:00
Lior Kaplan
9d047bb138 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:21:20 +03:00
Lior Kaplan
b0b47a2064 Update copyright year to 2014 2014-06-18 00:18:47 +03:00
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
dd57ceb1de Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:57:55 -07: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
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04:00
Adam Harvey
f79f3ac184 Fix broken test. 2014-06-11 00:22:13 +00:00
Adam Harvey
c12f832479 Add a mime type map generation script and update the header. 2014-06-11 00:19:49 +00:00
Adam Harvey
8c59ae345e Move the mime type map out of php_cli_server.c for easier generation. 2014-06-11 00:18:33 +00:00
Adam Harvey
faa34f24e3 Replace the CLI server's linear search for extensions with a hash table. 
This doesn't make a statistically significant performance impact either way
today, but gives us more scope to grow the MIME type list.
 2014-06-10 23:57:42 +00:00
Remi Collet
39885d0819 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
 2014-06-10 10:39:10 +02: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
Xinchen Hui
c2082ece52 Fixed apply_func_t (they should be broken before) 2014-05-25 18:32:35 +08:00
Dmitry Stogov
17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
d0ed1212a4 Enable PCRE JIT compiler 2014-04-25 08:33:37 +04:00
Anatol Belski
0ffdcfe756 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #67079 Missing MIME types for XML/XSL files
 2014-04-16 09:50:24 +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
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Ferenc Kovacs
a6e56586c6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing skip to the output, so we actually skip this test
 2014-04-07 16:59:27 +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
Dmitry Stogov
76cc99fe60 Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) 2014-04-03 15:26:23 +04:00
Dmitry Stogov
2e3e96b24b Fixed zend_string*/char* mess 2014-03-18 14:53:13 +04:00
Dmitry Stogov
232f3e915c Fixed various CLI problems 2014-03-14 18:00:42 +04:00
Remi Collet
0821d3942e Merge branch 'PHP-5.6' 
* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:38 +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
Xinchen Hui
fb825a95d0 Fixed module name printing 2014-02-28 13:02:28 +08:00
Xinchen Hui
43b03c74b3 Refacting smart_str 2014-02-18 17:42:46 +08:00
Dmitry Stogov
a52817eb02 Use better data structures (incomplete) 2014-02-14 14:11:52 +04: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
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04: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
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