clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
83,725 Commits 494 Branches 1,367 Tags 881 MiB
41115d3d9d
Commit Graph

590 Commits

Author SHA1 Message Date
Anatol Belski
b7e7a89541 several fixes - 
- param parsing Z_PARAM_STR vs Z_PARAM_STRING
- some functions for new params
- etc
 2014-08-16 12:55:13 +02:00
Anatol Belski
cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov
27f38798a1 Fast parameter parsing API 
This API is experemental. It may be changed or removed.
It should be used only for really often used functions.
(Keep the original parsing code and wrap usage with #ifndef FAST_ZPP)
 2014-07-11 16:32:20 +04:00
Dmitry Stogov
bce6a36c8a Merge branch 'master' into test 
* master: (48 commits)
  change locale - looks like not everybody has sl_SI
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
  Fix handling of session user module custom handlers.
  Reference bug report instead of github issue in NEWS file
  add more exts for Travis
  Update NEWS
  Fix phpdbg.1 man page installation when build != src directory
  BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
  reorder
  restore API compatibility
  finish
  refactor php_stream_temp_create{,_ex} and use it for the php://input stream
  refactor _php_stream_fopen_{temporary_,tmp}file()
  fix length overflow of HTTP_RAW_POST_DATA
  Update NEWS
  Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
  ...

Conflicts:
	ext/opcache/zend_accelerator_util_funcs.c
	ext/session/mod_user.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/standard/file.c
	ext/standard/streamsfuncs.c
	ext/standard/string.c
	main/streams/memory.c
 2014-07-07 19:21:23 +04:00
Michael Wallner
122ee0a1cf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix integer overflow in {stream,file}_{get,put}_contents()
 2014-07-02 09:56:05 +02:00
Michael Wallner
1e06c73192 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix integer overflow in {stream,file}_{get,put}_contents()
 2014-07-02 09:55:15 +02:00
Michael Wallner
34e686c556 fix integer overflow in {stream,file}_{get,put}_contents() 2014-07-02 09:53:03 +02:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov
17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Nikita Popov
7c93a7e078 Fix leak I introduced 2014-04-26 11:26:37 +02:00
Nikita Popov
dd419d24ca Replace more convert_to_* calls 2014-04-25 23:21:05 +02:00
Nikita Popov
b1b7939b0f Move more code to use zval_get_string 2014-04-25 23:21:04 +02: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
Stanislav Malyshev
774f16318b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:27:39 -07:00
Stanislav Malyshev
5addf223d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86 Fix bug #65701: Do not use cache for file file copy 2014-04-20 15:22:44 -07:00
Dmitry Stogov
7652a977a8 Use ZEND_FETCH_FOREACH_* macros to iterate over HashTables instead of zend_hash_move_forward() and family. 2014-04-18 19:18:11 +04:00
Dmitry Stogov
3257dc09eb Prevented modification of interned string 2014-04-16 22:42:15 +04:00
Dmitry Stogov
f9b26bc39a Cleanup (2-nd round) 2014-04-15 21:56:30 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04: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
5604cfbbba cleanup 2014-03-27 18:14:42 +04:00
Xinchen Hui
9f3687d4db Use list_close here to fix ext/standard/tests/file/popen_pclose_basic.phpt 2014-03-09 19:56:48 +08:00
Dmitry Stogov
dd7c7e6fb2 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 
Conflicts:
	ext/standard/formatted_print.c
 2014-03-05 11:26:35 +04:00
Dmitry Stogov
040dea8b82 Arguments taken by internal functions using zend_parse_parameters() with "+" and "*" specifications must not be deallocated anymore. 2014-03-05 11:10:52 +04:00
Xinchen Hui
f853449ce8 Fixed memory leak temporary 2014-03-04 20:29:48 +08:00
Xinchen Hui
bab58ab97e Fixed stream_select (incompeleted) 2014-03-04 19:12:43 +08:00
Xinchen Hui
d821c90148 Return empty string 2014-03-03 23:09:31 +08:00
Dmitry Stogov
1ac966d524 Fixed memory leaks 2014-02-25 23:12:25 +04:00
Xinchen Hui
5adeaa147d Refactoring php_stream_copy_to_mem to return zend_string 2014-02-24 18:12:30 +08:00
Xinchen Hui
70baf8f419 Fixed the memroy leak first (refactor it later) 2014-02-23 21:43:59 +08:00
Xinchen Hui
c0aba2c641 Refactor basename using zend_string 2014-02-23 18:08:35 +08:00
Daniel Lowrey
3a9829af20 Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests 2014-02-20 17:10:06 -07:00
Xinchen Hui
43b03c74b3 Refacting smart_str 2014-02-18 17:42:46 +08:00
Dmitry Stogov
40e053e7f3 Use better data structures (incomplete) 2014-02-13 17:54:23 +04: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
Daniel Lowrey
2ddefbd2b3 Added support for TLSv1.1 and TLSv1.2 2013-10-08 14:09:17 -04:00
Stanislav Malyshev
524fab3e41 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Expose fputcsv's escape_char to userland
 2013-08-24 20:46:03 -07:00
Joey Smith
2139d2702d Expose fputcsv's escape_char to userland 
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
 2013-08-24 20:45:14 -07:00
Andrey Hristov
92d27ccb05 Constify streams API and a few other calls down the rabbit hole. 
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
 2013-07-30 12:49:36 +02:00
Stanislav Malyshev
748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Jille Timmermans
dba22c0864 Dereferencing process-handles no longer waits on those processes. 
Implements FR #46487
 2013-01-15 21:50:35 +01:00
Andrey Hristov
22ba2b95ce Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-01-15 11:06:59 +01:00
Adam Harvey
b1bf524140 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Revert "Update fputcsv() to escape all characters equally."
 2013-01-15 17:35:34 +08:00
Adam Harvey
c077074c13 Revert "Update fputcsv() to escape all characters equally." 
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e805.
 2013-01-15 17:33:54 +08:00
Adam Harvey
ba32970710 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update fputcsv() to escape all characters equally.
 2013-01-15 15:26:25 +08:00
Adam Harvey
a4191b0aad Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update fputcsv() to escape all characters equally.
 2013-01-15 15:24:21 +08:00
Adam Harvey
9b5cb0e805 Update fputcsv() to escape all characters equally. 
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit.  This can result in malformed
CSV.

Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
 2013-01-15 15:17:45 +08:00