Commit Graph

496 Commits

Author SHA1 Message Date
Dmitry Stogov
1018f462d8 Patch improvement:
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
2015-03-30 18:53:38 +03:00
Anatol Belski
ec89c85054 cleaning up the version macros 2015-03-23 20:13:59 +01:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Dmitry Stogov
3e31838d19 zend_read_property() has to provide a holder for return value.
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
2015-01-22 11:50:42 +03:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Nikita Popov
2d212b426a Drop duplicate arg from hash_get_current_key_ex 2014-12-26 21:06:18 +01:00
Anatol Belski
7b6ed8db2f almost all the replacements of TSRMLS_* are done
Some places have to be yet touched as they use different/custom
macros namings for the same. Also some places in the code became
redundant now, this is the next task. To name some: ext/mysqlnd,
sapi/embed, ext/curl and some smaller places here and there.
2014-12-14 14:22:42 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski
4f3ac2cdbe Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
  NEWS
  adapt test for error message introduce in fix for #68463
  Fix bug #68463 listen.allowed_clients can silently result in no allowed access
  run a few request in this test
  fix test
  fix test
  added info about some other macro changes
  added note about toolset and phpize
  added note about the response files
  split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
  split formatter_format*.phpt for ICP 54.1
  split dateformat_timezone_arg_variations*.phpt for ICU 54.1
  split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
  fix icu version to test
  split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
  split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
  split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
  split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
  clone dateformat_calendars_variant3.phpt for ICU 54.1
  split collator_get_sort_key_variant3.phpt for icu 54.1
  ...
2014-11-20 15:20:18 +01:00
Veres Lajos
4b9535341a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
Anatol Belski
c6bad96f30 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (398 commits)
  NEWS
  add test for bug #68381
  Fixed bug #68381 Set FPM log level earlier during init
  proper dllexport
  move to size_t where zend_string is used internally
  fix some datatype mismatches
  return after the warning, to fix uninitialized salt usage
  fix datatype mismatches
  add missing type specifier
  fix datatype mismatches
  fix unsigned check
  "extern" shouldn't be used for definitions
  joined identical conditional blocks
  simplify fpm tests
  SEND_VAR_NO_REF optimization
  Add test for bug #68442
  Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
  Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
  Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
  Add new FPM test for IPv4/IPv6
  ...

Conflicts:
	win32/build/config.w32
2014-11-18 21:18:52 +01:00
Anatol Belski
e5acd78f7a fix datatype mismatch 2014-11-13 19:57:32 +01:00
Anatol Belski
5f81cfe097 fix datatype mismatch and kick unused var 2014-11-13 19:57:30 +01:00
Anatol Belski
c865472ef0 fix datatype mismatches, remove dead part of code 2014-11-13 19:57:29 +01:00
Anatol Belski
efe9cc3a86 rework fix to php_com_do_invoke_byref,
fix crashing function with void arguments
2014-10-28 17:25:09 +01:00
Anatol Belski
05fa1b8ecc fix possible zero deref 2014-10-28 17:25:08 +01:00
Anatol Belski
e2951a191e fix error code upcast on x64 2014-10-28 17:25:06 +01:00
Anatol Belski
26e7e54e78 several fixes to com_dotnet for x64 2014-10-28 17:25:05 +01:00
Anatol Belski
3b6a9a3916 exclude the 32 bit only test 2014-10-28 17:25:04 +01:00
Anatol Belski
1493124e2b initialize the input arg lengths 2014-10-28 17:25:02 +01:00
Anatol Belski
41a505fc7f fix datatype mismatches 2014-10-28 17:25:00 +01:00
Anatol Belski
4fce2ae2c6 opcache, intl, gmp, exif, com, bcmath to use static tsrmls 2014-10-17 15:51:21 +02:00
Anatol Belski
c00424e427 bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
Anatol Belski
e1cd0e0a38 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (40 commits)
  int to size_t where the underlaying API supports it
  use php_socket_t instead of int
  fix signed/unsigned mismatch warning
  fix compilation warning
  Improved specialisation $this variable accessed through IS_UNUSED operand must be IS_OBJECT, so we don't have to check for its type or perform dereference.
  Add notes about get_class_entry/get_class_name to UPGRADING
  Fix casts in GD
  Drop redundant casting code from ext/filter
  update NEWS
  update NEWS
  update NEWS
  update NEWS
  Added note to UPGRADING regarding 64-bit support in pack()/unpack()
  pack(): Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG
  Add 64 bit formats to pack() and unpack()
  Help to CPU branch predictor
  Removed unused EG(orig_error_reporting)
  Update get_class_name semantics
  Remove Z_OBJ_CLASS_NAME_P
  Improved VM stack primitives for fast paths. Slow paths are not inlined anymore.
  ...
2014-10-10 22:51:13 +02:00
Nikita Popov
df79b9b27a Update get_class_name semantics
* get_class_name is now only used for displaying the class name
   in debugging functions like var_dump, print_r, etc. It is no
   longer used in get_class() etc.
 * As it is no longer used in get_parent_class() the parent
   argument is now gone. This also fixes incorrect parent classes
   being reported in COM.
 * get_class_name is now always required (previously some places
   made it optional and some required it) and is also required
   to return a non-NULL value.
 * Remove zend_get_object_classname. This also fixes a number of
   potential leaks due to incorrect usage of this function.
2014-10-09 20:48:27 +02:00
Nikita Popov
9903f16e5c Remove get_class_entry handlers in COM 2014-10-09 14:42:56 +02:00
Anatol Belski
ee4ae7fbc3 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  remove the remains of dsp files handling
  fix EX usage
  remove misprint parentheses
  remove misprint parentheses
  Replaced EG(This) and EX(object) with EX(This). Internal functions now recieves zend_execute_data as the first argument.
  And this one...
  It should be in extern c
  Remove useless condition
  NEWS entry for previous commit
  NEWS entry for previous commit
  add IPv6 support to php-fpm
  Micro optimization for the most frequency case
  Add hash to EXTENSIONS file
  Remove extensions which are long gone
  we also have xz release tarballs since 5.5
  Fix ZTS build
  improved file size computation in stat()
  Fixed incorrect compilation
  5.5.19 now
2014-10-03 20:30:49 +02:00
Anatol Belski
ea5f6eaf19 fix EX usage 2014-10-03 19:23:34 +02:00
Dmitry Stogov
bd9a234645 Replaced EG(This) and EX(object) with EX(This).
Internal functions now recieves zend_execute_data as the first argument.
2014-10-03 19:32:46 +04:00
Anatol Belski
c032299d4f cleanup TSRMLS_FETCH in com 2014-09-26 13:30:10 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Dmitry Stogov
bccc653185 Avoid double IS_INTERNED() check 2014-09-19 17:32:50 +04:00
Anatol Belski
4c496a7f5b fix signature 2014-09-15 11:30:25 +02:00
Anatol Belski
481bf25b6a restore the length var and fix the com_dotnet ini 2014-09-01 20:34:33 +02:00
Anatol Belski
6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
b63ab83256 several signature and data type fixes 2014-08-26 13:20:21 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
4a85ec874a fix zpp 2014-08-21 20:31:32 +02:00
Anatol Belski
074172061e ported ext/com_dotnet 2014-08-19 22:23:03 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
7497c8793d Merge branch 'master' into phpng
* master: (51 commits)
  Update Git rules
  Back to -dev (with EOL notice in NEWS)
  new NEWS block for the next release
  It's 2014 already, fix copyright year where user visible
  PHP 5.3.29
  Some changes were lost in the merge commit of #66091
  Updated NEWS for #66091
  Fixed #66091
  Updated NEWS for #66091
  Updated NEWS for #66091
  Fixed #66091
  updated NEWS
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"
  PHP 5.3.29RC1
  Fix missing type checks in various functions
  ...

Conflicts:
	ext/date/php_date.c
	ext/standard/math.c
2014-08-14 23:30:49 +04:00
Anatol Belski
f50c50a1f8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
2014-08-12 11:52:07 +02:00
Anatol Belski
934c35f586 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  backported the fix for bug #41577
2014-08-12 11:50:55 +02:00
Anatol Belski
daa1fb8ba6 backported the fix for bug #41577 2014-08-12 11:49:46 +02:00
Anatol Belski
b3860f4224 Merge branch 'pull-request/681' 2014-08-12 11:45:05 +02:00
Dmitry Stogov
3ae802508a Fixed mode 2014-08-11 18:38:36 +04:00
Dmitry Stogov
8013a27ad9 Implemented ext/com_dotnet support for phpng 2014-08-11 18:37:26 +04:00
Dmitry Stogov
7301994c28 Merge branch 'master' into phpng
* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
2014-08-04 13:56:27 +04:00
Stanislav Malyshev
c41ca94824 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix missing type checks in various functions

Conflicts:
	ext/openssl/openssl.c
2014-07-28 00:37:32 -07:00
Stanislav Malyshev
531be9662f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix missing type checks in various functions
2014-07-28 00:34:27 -07:00
Stanislav Malyshev
b4a4db467b Fix missing type checks in various functions 2014-07-27 02:42:49 -07:00
Aidas Kasparas
d339ddf417 Bug #41577 fix: reinitialization of dotnet_domain structure member 2014-05-22 09:54:44 +03:00
Dmitry Stogov
cd4b4dfc4d Merge branch 'master' into refactoring2
Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c
2014-05-05 13:02:43 +04:00
Anatol Belski
3023257ff0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:38 +02:00
Anatol Belski
3fbacdc6e8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:03 +02:00
Anatol Belski
2d625b5f81 Fixed bug #66431 Special Character via COM Interface (CP_UTF8) 2014-04-29 13:40:44 +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
Bob Weinand
f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +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
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Felipe Pena
fba44be828 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN
2013-06-25 21:40:24 -03:00
Felipe Pena
4289696828 - Fixed bug #62475 (variant_* functions causes crash when null given as an argument) 2013-06-25 21:36:50 -03:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Johannes Schlüter
3cd50ca714 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #62146 	com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN
2012-05-25 00:23:51 +02:00
Johannes Schlüter
8fc9df3f67 Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy 2012-05-25 00:22:25 +02:00
Anatoliy Belsky
b67a4cc340 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
2012-04-03 13:09:17 +02:00
Anatoliy Belsky
94cefaedaf Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192 2012-04-03 13:07:51 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
788be2c54a Fixed bug #60167 (Crash / memory corruption in ext/com_dotnet) (Timm Friebe). 2011-11-25 11:29:28 +00:00
Stanislav Malyshev
77d0643b68 fixes for bug #55748 2011-11-18 07:11:19 +00:00
Pierre Joye
8535adfb31 - Fix #55301 (com_dotnet part) check if malloc succeded 2011-07-28 10:34:16 +00:00
Pierre Joye
582c2fa868 - Fix #55301 (com_dotnet part) check if malloc succeded 2011-07-28 10:34:16 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Pierre Joye
131b658982 - this function is only in trunk 2011-01-20 13:57:40 +00:00
Pierre Joye
54e9aa9110 - fail when no known op are given 2011-01-20 06:58:04 +00:00
Pierre Joye
739a870b0d - fail when no known op are given 2011-01-20 06:58:04 +00:00
Pierre Joye
d83d01a32e - unused var 2011-01-20 06:55:11 +00:00
Pierre Joye
4ff753b99b - unused var 2011-01-20 06:55:11 +00:00
Pierre Joye
a0708af925 - fail when no known op are given 2011-01-20 06:54:28 +00:00
Pierre Joye
1e9faabe8e - fail when no known op are given 2011-01-20 06:54:28 +00:00
Pierre Joye
ed5594f135 - kill local redeclaration 2011-01-20 06:49:17 +00:00
Pierre Joye
eddf7586db - kill local redeclaration 2011-01-20 06:49:17 +00:00
Pierre Joye
17c1ba460d - init err (and simplify) 2011-01-20 06:45:52 +00:00
Pierre Joye
3292399d27 - init err (and simplify) 2011-01-20 06:45:52 +00:00
Pierre Joye
aac73eb84a - init err 2011-01-20 06:44:16 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
4574844c52 - cleanup broken double definition of php_win_err and rename it while being there 2010-11-25 23:06:12 +00:00
Kalle Sommer Nielsen
1fed0e5a84 Kill some more constness warnings in com_dotnet/phar/standard 2010-11-19 16:03:00 +00:00
Pierre Joye
ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +00:00
Kalle Sommer Nielsen
9c4a92cf51 There are a few cases where we can save a TSRMLS_FETCH() call here 2010-09-23 04:50:26 +00:00
Pierre Joye
aa0ed267a2 - use TSRMLS_*C instead of TSRMLS_FETCH in zend_list_insert 2010-09-16 09:13:19 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Dmitry Stogov
94dd83722b Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table 2010-04-20 10:57:45 +00:00
Stanislav Malyshev
b65385aa44 fix non-ts build 2010-04-16 23:36:53 +00:00
Kalle Sommer Nielsen
7ef4cdf471 Remove a couple TSRMLS_FETCH() calls around ext/main/sapi 2010-04-13 11:02:15 +00:00
Stanislav Malyshev
de363cf818 fix #49192 - crash in GC when get_properties handler returns null 2010-04-01 22:54:03 +00:00
Stanislav Malyshev
44a5b8e459 fix #49192 - crash in GC when get_properties handler returns null 2010-04-01 22:54:03 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Pierre Joye
1431ba235b - Fixed crash in com_print_typeinfo when an invalid typelib is given 2009-10-27 19:16:55 +00:00
Kalle Sommer Nielsen
485f28aae9 MFH: Fixed #45280 (Reflection of instantiated COM classes causes PHP to crash) (Paul Richards, Kalle) 2009-07-01 18:44:56 +00:00
Kalle Sommer Nielsen
ff88b45ffc MFH: Fix compiler warnings 2009-05-19 17:38:29 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Jani Taskinen
b17dc14f18 MFH: nuketh C++ comments 2008-08-03 12:15:55 +00:00
Felipe Pena
2838f22fc0 - Added arginfo 2008-07-14 18:08:37 +00:00
Felipe Pena
84a8bb038a MFH: New way for check void parameters 2008-03-10 22:15:36 +00:00
Nuno Lopes
61eb7ae554 remove unused PHP_EXTNAME_API macros.
#in preparation for the gcc 4 visibility patch
2008-01-03 16:20:33 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Dmitry Stogov
c3ab6bd091 Fixed bug #43136 (possible crash on script execution timeout. The EG(function_state_ptr) is completely removed, EG(current_execute_data)->function_state must be used instead) 2007-11-20 09:51:12 +00:00
Yiduo (David) Wang
4b4d634cb9 MFH: Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:22:07 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Dmitry Stogov
1b01048cd8 Fixed 64-bit issues 2007-04-09 15:32:35 +00:00
Dmitry Stogov
6c394c8b38 ZTS fix 2007-04-09 15:32:08 +00:00
Martin Kraemer
9c62ddde34 Typo 2007-03-14 09:58:14 +00:00
andy wharmby
a252c79d53 Fixed bug #35872 (Prevent object store references during RSHUTDOWN) 2007-03-05 15:49:00 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Stanislav Malyshev
31a325823a Cosmetic fix - safe_emalloc(nmemb, size, offset) 2007-02-21 01:13:44 +00:00
Stanislav Malyshev
a72041406b CreateInstance requires BSTR (should fix #33188) 2007-02-21 01:11:11 +00:00
Stanislav Malyshev
47e06ea821 fix unallocated free 2007-02-20 20:30:36 +00:00
Dmitry Stogov
955d3e73e8 typo 2007-02-19 17:29:19 +00:00
andy wharmby
74cafe0840 Fixed bug #37927 (Prevent trap when COM extension processes argument of type VT_DISPATCH|VT_REF) 2007-02-02 15:44:06 +00:00
andy wharmby
cda82bc0a3 Fixed bug #34564 (COM extension not returning modified "out" argument) 2007-02-02 15:27:35 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Rob Richards
47fb655a56 fix bug #33734 and related (Something strange with COM Object)
- caused by fix in com_handlers.c rev 1.22.2.5
2006-12-24 12:32:10 +00:00
Rob Richards
b7ec6f90e0 - fix bug #33386 (ScriptControl only sees last function of class): com_wrapper.c
- fix bug #37588 (COM Property propputref converts to PHP function
  and can't be accesed): com_handlers.c
- fix bug #39596 (Creating Variant of type VT_ARRAY): com_variant.c
- add tests
2006-12-24 10:00:59 +00:00
Rob Richards
c2c9908f88 fix heap corruption when adding/caching typelib (also fixes bug 39606)
add test
2006-12-09 10:52:09 +00:00
Dmitry Stogov
c06f9e1efe COM initialization/deinitialization are done only if necessary 2006-11-17 11:40:52 +00:00
Ilia Alshanetsky
941c036297 Fixed bug #36644 (possible crash in variant_date_from_timestamp()). 2006-11-13 15:33:26 +00:00
Ilia Alshanetsky
76f23d4dcf Fixed bug #38400 (Use of com.typelib_file may cause a crash). 2006-10-18 23:47:33 +00:00
Ilia Alshanetsky
df5c300303 Fixed bug #38198 (possible crash when COM reports an exception). 2006-10-10 17:32:50 +00:00
Edin Kadribasic
480e788d95 Fix for #38985 (Wez) 2006-10-06 12:23:30 +00:00
Ilia Alshanetsky
4c65e0e1cd Added missing validation checks around expand_filepath() 2006-09-16 18:10:32 +00:00
Dmitry Stogov
b0c4150967 Prevent opening of empty filename "" 2006-09-08 05:52:00 +00:00
Edin Kadribasic
21ac19eb94 Fixed #37602 by olek at neurosoft dot pl 2006-08-25 12:01:57 +00:00
Dmitry Stogov
1dbaae2795 Added automatic module globals management 2006-06-15 18:33:09 +00:00
Rob Richards
f064d19f40 - Update after api changes 2006-05-10 14:39:10 +00:00
Antony Dovgal
59b8592c8c fix bug #36898 (__set() leaks in classes extending internal ones)
Added:
ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC)
ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC)

to initialize and destroy zend_object structs
2006-03-29 14:28:43 +00:00
Rob Richards
7831900882 fix mem leak with iterators
fix object casting for edge case
2006-02-07 11:50:54 +00:00
Rob Richards
a78a0b460c Fixed bug #34272 (empty array onto COM object blows up)
fix mem leaks
WS fixes
add test
2006-02-04 10:57:28 +00:00
Rob Richards
c53b926a35 Fix bug #35954 (Fatal com_exception casting object) 2006-01-26 11:17:34 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
Rob Richards
934e19107d Fixed bug #35316 (Application exception trying to create COM object) 2005-11-27 12:19:04 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Antony Dovgal
755b027e8c fix C++ comments 2005-04-22 08:59:21 +00:00
Wez Furlong
7013788711 merge from branch: fixes for #32758 and #32759 2005-04-19 06:14:56 +00:00
Wez Furlong
195f69f0c7 merge bug fixes from branch 2005-04-18 16:38:31 +00:00
Ilia Alshanetsky
0810696e50 removed unused vars. 2005-04-18 03:04:15 +00:00
Ilia Alshanetsky
496031df78 emalloc -> safe_emalloc. 2004-11-21 20:43:10 +00:00
Rob Richards
8f32b61acb fix crash when calling com methods
- due to change in Zend
2004-11-20 11:40:49 +00:00
Wez Furlong
9bffcfb407 Fix crash bug.
# how the f*** did this work in the first place!?
2004-10-09 13:08:16 +00:00
Wez Furlong
b3d9c5bea6 Improve .Net support; this should reduce "failed to init .net" errors.
Improve error reporting while we're at it too.
2004-10-09 04:39:58 +00:00
Wez Furlong
9ce9605723 Use the correct free() here... 2004-09-19 22:20:55 +00:00
Wez Furlong
8c4b687769 Fix for Bug #29490 from Michael Sisolak.
Another fine patch; thanks Michael.
2004-08-07 21:00:59 +00:00
Wez Furlong
4d39a171ee Even more verbosity... 2004-08-03 12:41:26 +00:00
Wez Furlong
f765acea59 Even more verbosity in case of error 2004-08-03 09:44:04 +00:00
Wez Furlong
d38f944d1c Better error reporting 2004-08-02 18:02:48 +00:00
Wez Furlong
d4ad4ac370 Allow COM to build under non-zts.
Thanks Frank.
2004-07-31 17:27:03 +00:00
Wez Furlong
7b1d95adba Fix my favourite call user func mistake 2004-07-29 14:06:24 +00:00
Wez Furlong
4da80ed1de Use the correct lengths when building the name -> dispid mapping 2004-07-29 06:19:27 +00:00
Wez Furlong
a783891e76 that's not my copy of the exception ctor, do don't fiddle its flags. 2004-07-27 22:17:40 +00:00
Wez Furlong
aa74430ee0 "better" "fix" for #29392.
This fixes the crash; the sample script:

	$c = new COM('ADODB.Connection');
	echo $c;

still does not work because the engine tries to call $c->__toString() and the
ADODB object *might* implement that method, but doesn't know until you open the
connection.
2004-07-27 22:17:00 +00:00
Wez Furlong
3e327b6e21 protect caller from a potential bailout 2004-07-27 03:44:40 +00:00
Wez Furlong
530d41732d Revert last fix, because it breaks dynamic methods 2004-07-27 02:37:54 +00:00
Wez Furlong
20534bc445 Fix #29392 COM behaved badly for non-existant methods 2004-07-27 01:59:44 +00:00
Wez Furlong
8a8b20877c Possible fix for #29258 (unverified)
win32 people, please test (I have no working win32 build env right now)
2004-07-19 13:39:57 +00:00
Ilia Alshanetsky
f28b063c28 Last dangerous alloca() bits. 2004-07-08 01:18:43 +00:00
Ard Biesheuvel
5232a5afea 64-bit bugsquash party 2004-06-16 23:57:25 +00:00
Wez Furlong
f8518cc83a Implement com_get_active_object() and a helper object for working with
persistent COM objects.
(That's the last of the stuff I want to sneak in before 5.0 is released).
2004-05-09 15:21:29 +00:00
Wez Furlong
6f8233897e Urgh!
Use the correct function to free messages from php_win_err(), otherwise
we say hello to Mr. S. Fault.
2004-05-09 14:28:19 +00:00
Wez Furlong
263723ec9b Update for count_elements handler for overloaded objects. 2004-05-04 15:03:48 +00:00
Wez Furlong
173cf83629 Enable writing to SafeArray dimensions. 2004-05-03 20:10:58 +00:00
Wez Furlong
92d87a6a8d Fix problem when assigning to a variable that holds an instance of
a COM/VARIANT/DOTNET object.
2004-05-03 18:19:07 +00:00
Wez Furlong
8ca144bba5 Fixup some constants and error handling.
Remove unfinished and un-needed function.
2004-05-03 15:51:41 +00:00
Wez Furlong
1ee2b46d2f Should have tested this change before committing. 2004-04-28 23:24:33 +00:00
Wez Furlong
027d450166 Fix for Bug #28161 (and probably others that I can't find in the bug db;
the search interface sucks).

Expand the proxy object so it can handle psuedo array style properties.

ASP/VB code like this:

	headObj.Attribute("RID") = rid

can be expressed like this in PHP:

	$headObj->Attribute['RID'] = $rid;

In theory, this feature can be used for "multi dimensional" properties:

	headObj.Attribute("RID", "Foo") = rid;

like this:

	$headObj->Attribute['RID']['Foo'] = $rid;
2004-04-28 08:23:22 +00:00
Wez Furlong
696663bc3d Add test 2004-04-22 14:29:33 +00:00
Wez Furlong
91dc1a516a A working fix for the safearray mapping bug. 2004-04-22 14:27:11 +00:00
Wez Furlong
c50726fa4b (probable) fix for Bug #27974: PHP Arrays are not mapped to VARIANTs. 2004-04-22 00:50:49 +00:00
Wez Furlong
d16ad34368 This wasn't updated for new parameters for object handlers yet... 2004-04-13 17:51:36 +00:00
Hartmut Holzgraefe
eeb172b29f "The Visa to Sibiria" (work in progress)
Adding a package.xml to a bundled extension does not only
ease the transition to PECL whereever suitable but also
allows to build and install an extension as "shared" using
the PEAR installer without having to deal with phpize and
friends by hand
2004-03-23 19:46:10 +00:00
Wez Furlong
27d7cd8594 update for read handler api change 2004-03-22 22:47:05 +00:00
Ilia Alshanetsky
d0a4801579 s/emalloc/safe_emalloc/ where appropriate. 2004-03-18 02:16:35 +00:00
Marcus Boerger
7dd5b1f126 Rename hasMore() to valid() as discussed. (Part V) 2004-03-08 21:17:39 +00:00
Zeev Suraski
7c710a9f9b Use zval_ptr_dtor() to free variables as soon as they hit refcount of 0.
Note:  You should not be using ZVAL_DELREF() in day to day usage.  Instead,
       you should use zval_ptr_dtor().  Use ZVAL_DELREF() only if you're
       messing with the refcount directly and know what you're doing.
Note #2:  For clarity, if you want to initialize a new zval with a refcount
          of 0, it's best to do that directly, instead of using ZVAL_DELREF
          after allocating the zval...
2004-02-15 12:58:19 +00:00
Zeev Suraski
f041e73a67 Fix prototype/warning 2004-02-12 13:53:51 +00:00
Wez Furlong
08ed2cb9f7 fix copy-n-past error in constructor.
Spotted by Eric Colinet.
2004-02-12 12:11:21 +00:00
Zeev Suraski
30171a7590 zend_default_classes.h -> zend_exceptions.h 2004-02-12 10:43:27 +00:00
Zeev Suraski
2a9e1294bc Update to new API 2004-02-08 17:25:54 +00:00
Zeev Suraski
8424be849f - Update with new destructor code 2004-02-04 11:14:47 +00:00
Wez Furlong
42110742b7 update todo part of readme 2004-01-20 11:01:16 +00:00
foobar
f4983c0d3f - Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5 2004-01-17 13:00:38 +00:00
Wez Furlong
c205153a0a reinstate this ifdef for people without .Net SDK 2004-01-13 16:05:38 +00:00
Wez Furlong
bba1ded0b2 Fix refcount on these return values to avoid a leak and allow object dtor's to be called.
This in turn prevents a massive slow-down in CoUninitialize which would have to
forcibly destroy the COM objects in request shutdown.
2004-01-13 16:02:56 +00:00
Wez Furlong
4573a562a3 Fix leaking constructors.
Implement a cache for method signatures and DISPID's to
greatly improve performance when repeatedly accessing
members with the same names.
2004-01-13 13:38:11 +00:00
Wez Furlong
b7d0b397bc Support automatic handling of byref parameters 2004-01-13 00:40:14 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too..
# Should the LICENSE and Zend/LICENSE dates be updated too?
2004-01-08 17:33:29 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Wez Furlong
e10c206dac Port other major parts of PHP 4 COM extension into PHP 5 com_dotnet
extension.
This enables:
- iteration of SafeArray types via foreach()
- proxying of multi-dimensional SafeArray types so that multi-dimension
  array accesses work (untested!)
- Fix COM exceptions, and expose them as their own class of exception
  "com_exception"
- auto typelib file import (com.typelib_file ini option)
- event sinking
- wrapper to map PHP objects to COM
- fix mapping of variant values to PHP values

# Could someone please add com_saproxy.c and com_wrapper.c to the .dsp
# file?
2004-01-07 21:00:07 +00:00
Wez Furlong
6fd8bd2367 Explicitly depend on oleaut32.lib 2003-12-19 12:52:08 +00:00
Wez Furlong
09907c6b93 Fix use of the CorRuntimeHost; once it has been stopped for a process, it cannot be restarted, so we keep it alive for the duration of the process, and instead close down the application domain in
request shutdown.
2003-12-18 11:23:21 +00:00
Ilia Alshanetsky
1393ad9a35 Kill unused variables. 2003-12-09 01:54:56 +00:00
Wez Furlong
59823eca66 com_create_guid() returns... 2003-12-06 17:31:40 +00:00
Wez Furlong
98f1021dd8 Make these tests work under win32 2003-12-05 13:42:04 +00:00
Wez Furlong
24e54d43e6 check for .net headers 2003-12-05 02:58:31 +00:00
Wez Furlong
2d0eaa3989 Clarify a little. 2003-12-03 00:15:10 +00:00
Wez Furlong
05b9b20ed8 Add new (optional!) win32 build infrastructure.
Will follow up to internals@ shortly.
2003-12-02 23:17:04 +00:00
Wez Furlong
cab6d93bdd Fix #25664 - COM crashes when calling a Delphi implementations of ITypeInfo.
Problem was that our extension assumes that the first param to ITypeInfo::Invoke was a reference to the COM object; this is not necessarily true and caused a crash in this instance.
Problem solved by removing the ITypeInfo::Invoke call, as it doesn't buy us anything anyway.
2003-11-28 17:11:16 +00:00
Wez Furlong
440c4d983f fix memleak 2003-11-28 15:41:45 +00:00
Wez Furlong
6c0584d8f1 fix win32 build - thanks Sebastian. 2003-11-27 17:58:58 +00:00
Wez Furlong
0577d9310b bah. does it really make any difference where rewind lives in the struct!? 2003-10-18 15:56:16 +00:00
Wez Furlong
398f032203 fix cruft from previous incarnation of the iterators 2003-10-17 21:03:01 +00:00
Wez Furlong
d8d1ca3f3b add com iterator support 2003-10-17 20:52:18 +00:00
Wez Furlong
f27387c68c Fix possible segfault (this one came up when a method could not be found).
Add a couple of headers used by another file that is not yet ready to
commit.
2003-10-13 01:29:39 +00:00
Wez Furlong
18bfcc8897 A much better fix for moniker based COM object creation.
We now support binding monikers to remote machines.
However, MSDN docs indicate that this isn't yet implemented
as of Win2000.
2003-10-07 18:50:07 +00:00
Zeev Suraski
2cc9511cc7 Fix cast callbacks 2003-10-07 15:47:25 +00:00
Wez Furlong
a1b5c341a2 potential fix for #25759, although it will need further review. 2003-10-06 15:10:38 +00:00
Zeev Suraski
c6c240a455 Sync with new API 2003-10-05 08:08:49 +00:00
Zeev Suraski
e404e1d0fe Fix leak - non persistent hashes cannot be used in MINIT! 2003-08-18 20:45:00 +00:00
Ilia Alshanetsky
741014089e emalloc -> safe_emalloc 2003-08-18 04:41:48 +00:00
Wez Furlong
cb7f8881ea add credits 2003-08-14 20:48:06 +00:00
Wez Furlong
61313924a4 fix .net build 2003-08-14 20:31:38 +00:00
Wez Furlong
6df5d5ba20 Add new COM (and .Net) extension for php5.
Not yet complete, but should work for most people.
2003-08-14 16:49:56 +00:00