]> granicus.if.org Git - php/log
php
10 years agoMake internal non-static methods to be executed in context of class. Set EG(scope...
Dmitry Stogov [Thu, 23 Apr 2015 00:41:50 +0000 (03:41 +0300)]
Make internal non-static methods to be executed in context of class. Set EG(scope) accordingly.

10 years agoUse fast method to check if first arguments should be passed by reference (not tested...
Dmitry Stogov [Wed, 22 Apr 2015 18:46:13 +0000 (21:46 +0300)]
Use fast method to check if first arguments should be passed by reference (not tested onbig endian).

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Wed, 22 Apr 2015 17:40:47 +0000 (20:40 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix "invalid opcode" error

10 years agoFix "invalid opcode" error
Nikita Popov [Wed, 22 Apr 2015 15:38:49 +0000 (17:38 +0200)]
Fix "invalid opcode" error

Method call can happen on CONST, it'll just throw an error.

Not forbidding this at compile-time, so this can be overridden in
an extension.

10 years agoUse string primitive
Dmitry Stogov [Wed, 22 Apr 2015 11:23:22 +0000 (14:23 +0300)]
Use string primitive

10 years agoRemovred temporary code
Dmitry Stogov [Wed, 22 Apr 2015 10:14:03 +0000 (13:14 +0300)]
Removred temporary code

10 years agoImproved property inheritance code
Dmitry Stogov [Wed, 22 Apr 2015 09:53:54 +0000 (12:53 +0300)]
Improved property inheritance code

10 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Wed, 22 Apr 2015 08:37:19 +0000 (16:37 +0800)]
Merge branch 'master' of git.php.net:php-src

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Wed, 22 Apr 2015 08:36:29 +0000 (16:36 +0800)]
Merge branch 'PHP-5.6'

10 years agoWindows support for sysvshm
Kalle Sommer Nielsen [Wed, 22 Apr 2015 07:29:45 +0000 (09:29 +0200)]
Windows support for sysvshm

A little background:
* key_t is an int, like ext/shmop
* There is no ftok() (from ext/standard), so tests have a new check to see whether or not it is available. This however means that the 7 tests will all be skipped for Windows. I know we cannot properly implement an ftok() function since there is no inodes for NTFS, maybe we should look into using the GetFileInfoByHandle() or similar to use the system unique ID for a file to get the same functionality, Anatol?
* Despite the lack of phpt's, local testing works flawlessly but we better look into a solution for this if we are to keep this patch

10 years agoSince 5.6 stat.cwd using emalloc (Thanks to Remi)
Xinchen Hui [Wed, 22 Apr 2015 07:14:00 +0000 (15:14 +0800)]
Since 5.6 stat.cwd using emalloc (Thanks to Remi)

10 years agofixed warning & test pushing
Xinchen Hui [Wed, 22 Apr 2015 02:53:26 +0000 (10:53 +0800)]
fixed warning & test pushing

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 21 Apr 2015 23:30:10 +0000 (02:30 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  FAST_RET opcode also returns
  Also consider specific catches when checking for uncaught
  Break on uncaught exceptions in current frame in phpdbg

10 years agoKeep realpath and PCRE caches in consistency with opcache SHM.
Dmitry Stogov [Tue, 21 Apr 2015 23:29:06 +0000 (02:29 +0300)]
Keep realpath and PCRE caches in consistency with opcache SHM.

10 years agoFAST_RET opcode also returns
Bob Weinand [Tue, 21 Apr 2015 23:11:59 +0000 (01:11 +0200)]
FAST_RET opcode also returns

10 years agoAlso consider specific catches when checking for uncaught
Bob Weinand [Tue, 21 Apr 2015 23:07:52 +0000 (01:07 +0200)]
Also consider specific catches when checking for uncaught

10 years agoBreak on uncaught exceptions in current frame in phpdbg
Bob Weinand [Tue, 21 Apr 2015 21:09:09 +0000 (23:09 +0200)]
Break on uncaught exceptions in current frame in phpdbg

10 years agoSlight zend_hash_find() optimization.
Dmitry Stogov [Tue, 21 Apr 2015 20:27:44 +0000 (23:27 +0300)]
Slight zend_hash_find() optimization.

10 years agoFixed zend_string related inconsistencies
Dmitry Stogov [Tue, 21 Apr 2015 20:26:34 +0000 (23:26 +0300)]
Fixed zend_string related inconsistencies

10 years agoFix first frame in backtrace
Bob Weinand [Tue, 21 Apr 2015 20:20:11 +0000 (22:20 +0200)]
Fix first frame in backtrace

10 years agoFix yield from with iterator (first element missing)
Bob Weinand [Tue, 21 Apr 2015 17:41:51 +0000 (19:41 +0200)]
Fix yield from with iterator (first element missing)

10 years agoAdd next command docs
Bob Weinand [Tue, 21 Apr 2015 12:22:15 +0000 (14:22 +0200)]
Add next command docs

10 years agoMove more stuff to file_context
Nikita Popov [Mon, 20 Apr 2015 18:16:58 +0000 (20:16 +0200)]
Move more stuff to file_context

Introduce helper macro FC(x) for CG(file_context).x.

end_compilation() now handled by file_context_end().

While at it, dropped zval wrapper for ticcks.

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 21 Apr 2015 14:45:19 +0000 (22:45 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 21 Apr 2015 14:44:45 +0000 (22:44 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoRemove tail blank which is committed by accident
Xinchen Hui [Tue, 21 Apr 2015 14:44:22 +0000 (22:44 +0800)]
Remove tail blank which is committed by accident

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 21 Apr 2015 14:39:46 +0000 (22:39 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_compile.c

10 years agoUpdate NEWS
Xinchen Hui [Tue, 21 Apr 2015 14:37:25 +0000 (22:37 +0800)]
Update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 21 Apr 2015 14:37:00 +0000 (22:37 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed Bug #69467 (Wrong checked for the interface by using Trait)
Xinchen Hui [Tue, 21 Apr 2015 14:36:32 +0000 (22:36 +0800)]
Fixed Bug #69467 (Wrong checked for the interface by using Trait)

10 years agoFixed warnings and folder marks mess
Xinchen Hui [Tue, 21 Apr 2015 13:53:12 +0000 (21:53 +0800)]
Fixed warnings and folder marks mess

10 years agoFixed mem leak in assign_to_obj with reference
Xinchen Hui [Tue, 21 Apr 2015 13:04:20 +0000 (21:04 +0800)]
Fixed mem leak in assign_to_obj with reference

10 years agoAdd next command / Fix recursion/exceptions with u/F/L
Bob Weinand [Tue, 21 Apr 2015 10:31:43 +0000 (12:31 +0200)]
Add next command / Fix recursion/exceptions with u/F/L

10 years agoRemoved deprecated code
Dmitry Stogov [Tue, 21 Apr 2015 08:48:43 +0000 (11:48 +0300)]
Removed deprecated code

10 years agoCompact HashTables to reduce SHM usage
Dmitry Stogov [Mon, 20 Apr 2015 21:27:21 +0000 (00:27 +0300)]
Compact HashTables to reduce SHM usage

10 years agoAdapt test for new format
Bob Weinand [Mon, 20 Apr 2015 19:05:10 +0000 (21:05 +0200)]
Adapt test for new format

10 years agoShrink phpdbg opcode dump output a bit more
Bob Weinand [Mon, 20 Apr 2015 18:58:52 +0000 (20:58 +0200)]
Shrink phpdbg opcode dump output a bit more

10 years agoFixed bug #69388
Nikita Popov [Mon, 20 Apr 2015 15:39:32 +0000 (17:39 +0200)]
Fixed bug #69388

Renamed compiler_context to oparray_context. Introduced per-file
file_context. Moved import tables into the file_context.

context_stack no longer exists, instead keeping backups of contexts
on C stack. Same for file contexts.

TODO: Move more things out of CG into file_context. There should be
a number of other things that we should not try to reuse in nested
compilations.

10 years agoFixed reference counting
Dmitry Stogov [Mon, 20 Apr 2015 15:49:17 +0000 (18:49 +0300)]
Fixed reference counting

10 years agoRemoved invalid code
Dmitry Stogov [Mon, 20 Apr 2015 13:48:49 +0000 (16:48 +0300)]
Removed invalid code

10 years agoShow full stacktraces for exceptions in phpdbg
Bob Weinand [Mon, 20 Apr 2015 12:12:47 +0000 (14:12 +0200)]
Show full stacktraces for exceptions in phpdbg

10 years agoFix uncaught exception in phpdbg
Bob Weinand [Mon, 20 Apr 2015 11:55:09 +0000 (13:55 +0200)]
Fix uncaught exception in phpdbg

10 years agoshow opcode count
Bob Weinand [Mon, 20 Apr 2015 11:04:56 +0000 (13:04 +0200)]
show opcode count

10 years agoShorten opline dump lines and show literals
Bob Weinand [Mon, 20 Apr 2015 10:22:55 +0000 (12:22 +0200)]
Shorten opline dump lines and show literals

10 years agoThrow exception will override EX(opline)
Xinchen Hui [Mon, 20 Apr 2015 03:58:23 +0000 (11:58 +0800)]
Throw exception will override EX(opline)

10 years agoFixed bug #69485 (Double free on zend_list_dtor).
Xinchen Hui [Mon, 20 Apr 2015 03:48:21 +0000 (11:48 +0800)]
Fixed bug #69485 (Double free on zend_list_dtor).

10 years agoRefix opline usage
Xinchen Hui [Mon, 20 Apr 2015 02:51:55 +0000 (10:51 +0800)]
Refix opline usage

10 years agoProperly define ZEND_OP_DATA in zend_vm_def.h
Bob Weinand [Sun, 19 Apr 2015 21:21:57 +0000 (23:21 +0200)]
Properly define ZEND_OP_DATA in zend_vm_def.h
This allows zend_vm_gen.php to define them in zend_vm_opcodes.{c,h} without further hacks.

10 years agoProvide method to access opcodes via command line argument
Bob Weinand [Sun, 19 Apr 2015 19:53:49 +0000 (21:53 +0200)]
Provide method to access opcodes via command line argument

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Sun, 19 Apr 2015 18:34:36 +0000 (20:34 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  fix more dir separators

10 years agoupdated NEWS
Anatol Belski [Sun, 19 Apr 2015 18:33:09 +0000 (20:33 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Sun, 19 Apr 2015 18:32:37 +0000 (20:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  fix more dir separators

10 years agoupdated NEWS
Anatol Belski [Sun, 19 Apr 2015 18:30:43 +0000 (20:30 +0200)]
updated NEWS

10 years agofix more dir separators
Anatol Belski [Sun, 19 Apr 2015 18:27:28 +0000 (20:27 +0200)]
fix more dir separators

10 years agoHmm, zend.assertions is not really on/off, but -1/0/1
Bob Weinand [Sun, 19 Apr 2015 12:42:31 +0000 (14:42 +0200)]
Hmm, zend.assertions is not really on/off, but -1/0/1

10 years agoAdd zend.assertions and assert.exception to php.ini-*
Bob Weinand [Sun, 19 Apr 2015 11:27:28 +0000 (13:27 +0200)]
Add zend.assertions and assert.exception to php.ini-*

10 years agoStabilize watchpoints
Bob Weinand [Sun, 19 Apr 2015 10:53:06 +0000 (12:53 +0200)]
Stabilize watchpoints

10 years agoMerge branch 'pull-request/1239'
Stanislav Malyshev [Sun, 19 Apr 2015 03:45:16 +0000 (20:45 -0700)]
Merge branch 'pull-request/1239'

* pull-request/1239:
  fixes confusing SQLDescribeParam error message

10 years agoMerge branch 'pull-request/1238'
Stanislav Malyshev [Sun, 19 Apr 2015 02:51:22 +0000 (19:51 -0700)]
Merge branch 'pull-request/1238'

* pull-request/1238:
  apply a patch

10 years agoMerge branch 'pull-request/1235'
Stanislav Malyshev [Sun, 19 Apr 2015 02:34:52 +0000 (19:34 -0700)]
Merge branch 'pull-request/1235'

* pull-request/1235:
  modify skeleton confirm_extname_compiled
  modify skeleton.c function

10 years agoMerge branch 'pull-request/1203'
Stanislav Malyshev [Sun, 19 Apr 2015 02:32:14 +0000 (19:32 -0700)]
Merge branch 'pull-request/1203'

* pull-request/1203:
  Update openssl.c

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sun, 19 Apr 2015 00:57:18 +0000 (17:57 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove unused code from ext/json.

Conflicts:
ext/json/config.m4
ext/json/config.w32
ext/json/json.dsp
ext/json/package.xml

10 years agoMerge remote-tracking branch 'github/pr/637' into PHP-5.6
Stanislav Malyshev [Sun, 19 Apr 2015 00:51:42 +0000 (17:51 -0700)]
Merge remote-tracking branch 'github/pr/637' into PHP-5.6

* github/pr/637:
  Remove unused code from ext/json.

10 years agoRestore fix for bug #69337
Stanislav Malyshev [Fri, 17 Apr 2015 05:31:13 +0000 (22:31 -0700)]
Restore fix for bug #69337

10 years agoPartially enable leak reports for objects
Nikita Popov [Fri, 17 Apr 2015 10:37:51 +0000 (12:37 +0200)]
Partially enable leak reports for objects

Cycle leaks are currently not reported, because this needs further
work.

The last GC run has been moved to run earlier (before the object
store free), so that array cycles that hold references to objects
don't show up as leaks. Fingers crossed that this doesn't adversely
affect anything else.

10 years agoFix intdiv() test
Nikita Popov [Sat, 18 Apr 2015 15:30:28 +0000 (17:30 +0200)]
Fix intdiv() test

10 years agoBetter throw an exception in intdiv() for PHP_INT_MIN/-1
Bob Weinand [Sat, 18 Apr 2015 13:50:29 +0000 (15:50 +0200)]
Better throw an exception in intdiv() for PHP_INT_MIN/-1

10 years agoFix CALL_TRAMPOLINE without global regs
Nikita Popov [Sat, 18 Apr 2015 13:43:14 +0000 (15:43 +0200)]
Fix CALL_TRAMPOLINE without global regs

The opline needs to be loaded here in any case. However
LOAD_OPLINE() is a no-op if global VM registers are not used.

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Sat, 18 Apr 2015 08:00:24 +0000 (10:00 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  relax tests with huge year (new zic)

10 years agorelax tests with huge year (new zic)
Remi Collet [Sat, 18 Apr 2015 08:00:15 +0000 (10:00 +0200)]
relax tests with huge year (new zic)

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Sat, 18 Apr 2015 07:41:49 +0000 (09:41 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  ignore second value for huge timestamp test (new zic)

Conflicts:
ext/date/tests/getdate_variation7.phpt

10 years agoignore second value for huge timestamp test (new zic)
Remi Collet [Sat, 18 Apr 2015 07:37:06 +0000 (09:37 +0200)]
ignore second value for huge timestamp test (new zic)

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Sat, 18 Apr 2015 07:28:39 +0000 (09:28 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  relax test for date < INT32_MIN (new zic)

10 years agorelax test for date < INT32_MIN (new zic)
Remi Collet [Sat, 18 Apr 2015 07:28:29 +0000 (09:28 +0200)]
relax test for date < INT32_MIN (new zic)

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Sat, 18 Apr 2015 07:11:48 +0000 (09:11 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  relax bigbang content (new zic)

10 years agorelax bigbang content (new zic)
Remi Collet [Sat, 18 Apr 2015 07:11:39 +0000 (09:11 +0200)]
relax bigbang content (new zic)

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Sat, 18 Apr 2015 05:50:31 +0000 (07:50 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Make date transitions tests more flexible

10 years agoMake date transitions tests more flexible
Remi Collet [Sat, 18 Apr 2015 05:47:47 +0000 (07:47 +0200)]
Make date transitions tests more flexible

zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)

10 years agoFix memory error when throwing into a generator
Nikita Popov [Fri, 17 Apr 2015 20:19:41 +0000 (22:19 +0200)]
Fix memory error when throwing into a generator

throw_exception_internal will access opline+1, which is not always
defined at the current opline of the generator. To avoid this
decrement the opline before throwing (so the throw occurs at the
YIELD opcode instead of one after it).

10 years agoFix filter_var leak of object without __toString()
Nikita Popov [Fri, 17 Apr 2015 09:16:31 +0000 (11:16 +0200)]
Fix filter_var leak of object without __toString()

10 years agoInitialize VAR_FLAGS for generators
Nikita Popov [Fri, 17 Apr 2015 19:50:36 +0000 (21:50 +0200)]
Initialize VAR_FLAGS for generators

10 years agoMerge branch 'PHP-5.6'
Hannes Magnusson [Fri, 17 Apr 2015 17:14:31 +0000 (10:14 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail
  Fixed res leak

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Hannes Magnusson [Fri, 17 Apr 2015 17:14:12 +0000 (10:14 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail
  Fixed res leak

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Hannes Magnusson [Fri, 17 Apr 2015 17:06:31 +0000 (10:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail
  Fixed res leak

10 years agophpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate...
Hannes Magnusson [Fri, 17 Apr 2015 17:05:32 +0000 (10:05 -0700)]
phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail

10 years agoAdded test
Dmitry Stogov [Fri, 17 Apr 2015 15:45:46 +0000 (18:45 +0300)]
Added test

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Fri, 17 Apr 2015 15:38:03 +0000 (18:38 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance

10 years agoChange the GC approach to inner-loops handling. Switch to less efficient but more...
Dmitry Stogov [Fri, 17 Apr 2015 15:35:57 +0000 (18:35 +0300)]
Change the GC approach to inner-loops handling. Switch to less efficient but more robust algorithm. Destructors handling is still not completely accurate.

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Fri, 17 Apr 2015 15:14:18 +0000 (17:14 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Fri, 17 Apr 2015 15:13:45 +0000 (17:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance

10 years agofix column name attribute with ODBC 3.0
Anatol Belski [Fri, 17 Apr 2015 15:10:46 +0000 (17:10 +0200)]
fix column name attribute with ODBC 3.0

10 years agomigrate SQLAllocStmt for ODBC 3.0 compliance
Anatol Belski [Fri, 17 Apr 2015 14:09:35 +0000 (16:09 +0200)]
migrate SQLAllocStmt for ODBC 3.0 compliance

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Fri, 17 Apr 2015 13:21:03 +0000 (15:21 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  skip test when xml not available

10 years agoskip test when xml not available
Remi Collet [Fri, 17 Apr 2015 13:20:22 +0000 (15:20 +0200)]
skip test when xml not available

10 years agoFix Intl constructor leaks
Nikita Popov [Fri, 17 Apr 2015 08:26:26 +0000 (10:26 +0200)]
Fix Intl constructor leaks

Drop the Z_OBJ(return_value) = NULL hack and return status code
from ctor function instead.

10 years agoFix leak in transliterator_transliterate()
Nikita Popov [Fri, 17 Apr 2015 07:56:48 +0000 (09:56 +0200)]
Fix leak in transliterator_transliterate()

10 years agoFix leak in IntlDateFormatter::getTimeZone()
Nikita Popov [Thu, 16 Apr 2015 19:51:47 +0000 (21:51 +0200)]
Fix leak in IntlDateFormatter::getTimeZone()

10 years agoFix leak in IntlCalendar::fromDateTime()
Nikita Popov [Thu, 16 Apr 2015 19:43:19 +0000 (21:43 +0200)]
Fix leak in IntlCalendar::fromDateTime()

10 years agoAdded GC checks and improvements
Dmitry Stogov [Fri, 17 Apr 2015 00:55:37 +0000 (03:55 +0300)]
Added GC checks and improvements

10 years agoFixed memory-leak
Dmitry Stogov [Thu, 16 Apr 2015 22:27:54 +0000 (01:27 +0300)]
Fixed memory-leak