Bugfix #52958 and #57702 #118

Closed
wants to merge 10,000 commits into
from

Conversation

Projects
None yet
@hswong3i
  • Bug #52958 Segfault in PDO_OCI on cleanup after running a long testsuite.
  • Bug #57702 Multiple BLOB fetch fails.

cataphract and others added some commits Apr 23, 2012

Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only
fixed bug #61820
using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
fix bug #61443
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Additional fixs for bug 61746 - prepare/clean acls
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix masking in bug61115-1.phpt
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Make output order for dom007.phpt platform independent
Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards …
…information) and"

This reverts commit cb2a1c7.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
@reeze

This comment has been minimized.

Show comment
Hide comment
@reeze

reeze May 4, 2012

Contributor

I think use TSRMLS_CC instead of tsrm_ls would be much better here.

Contributor

reeze commented on Zend/zend.c in 72f19e9 May 4, 2012

I think use TSRMLS_CC instead of tsrm_ls would be much better here.

This comment has been minimized.

Show comment
Hide comment
@laruence

laruence May 4, 2012

Member
Member

laruence replied May 4, 2012

This comment has been minimized.

Show comment
Hide comment
@reeze

reeze May 4, 2012

Contributor

Look at this zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); every Thread safe function use Macro.

tsrm_ls should not used directly by any code.

I've search here, only two tsrm_ls one original one newly added.

Contributor

reeze replied May 4, 2012

Look at this zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); every Thread safe function use Macro.

tsrm_ls should not used directly by any code.

I've search here, only two tsrm_ls one original one newly added.

This comment has been minimized.

Show comment
Hide comment
@laruence

laruence May 4, 2012

Member

as I said: no need, TSRMLS_CC will always expand to tsrm_ls in ZTS .

anyway, I agree with that they should be consistent.

thanks, I will make them consistent later.

Member

laruence replied May 4, 2012

as I said: no need, TSRMLS_CC will always expand to tsrm_ls in ZTS .

anyway, I agree with that they should be consistent.

thanks, I will make them consistent later.

@reeze

This comment has been minimized.

Show comment
Hide comment
@reeze

reeze May 4, 2012

Contributor

This line have it too, maybe you would fix them a time;)I'v search the whole repository.

Contributor

reeze commented on Zend/zend.c in 72f19e9 May 4, 2012

This line have it too, maybe you would fix them a time;)I'v search the whole repository.

nikic and others added some commits Jun 19, 2012

Merge branch 'PHP-5.3' into PHP-5.4
I messed up the last merge somehow :/ Merge again.

* PHP-5.3:
  Add NEWS for bug #62262
  Fixed bug RecursiveArrayIterator does not implement Countable

Conflicts:
	ext/spl/spl_array.c
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove outdated and user-specific files
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve check for :memory: pseudo-filename in SQlite

Conflicts:
	ext/sqlite3/sqlite3.c
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #62384 (Attempting to invoke a Closure more than once causes segfaul)
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove extra ;
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove unneeded and outdated ChangeLog file
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Improved fix for #62384
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve json_encode error handling
  - BFN

Conflicts:
	ext/json/json.c

nikic and others added some commits Jun 24, 2012

@cjbj

This comment has been minimized.

Show comment
Hide comment
@cjbj

cjbj Jun 26, 2012

Contributor

Can you split the request into the two parts?
Can you add LOB tests?
Can you review/update pdo_oci_attr_autocommit_3.phpt which gives a diff with your patch?

Contributor

cjbj commented Jun 26, 2012

Can you split the request into the two parts?
Can you add LOB tests?
Can you review/update pdo_oci_attr_autocommit_3.phpt which gives a diff with your patch?

Fixed bug #62357 (compile failure: (S) Arguments missing for built-in…
… function __memcmp).

Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments
@cjbj

This comment has been minimized.

Show comment
Hide comment
@cjbj

cjbj Jun 26, 2012

Contributor

Also, did you check what effect (if any) the changes have on persistent connections?

Contributor

cjbj commented Jun 26, 2012

Also, did you check what effect (if any) the changes have on persistent connections?

smalyshev and others added some commits Jun 27, 2012

Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  ws fix
  BFN
  Fix bug #62373 (serialize() generates wrong reference to the object)

Conflicts:
	php.ini-development
	php.ini-production
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix memleak in CLI

Conflicts:
	sapi/cli/php_cli.c
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
@hswong3i

This comment has been minimized.

Show comment
Hide comment
@hswong3i

hswong3i Jun 27, 2012

Already split the patch, where #52958 checking with H->err should generally looks good?

Already split the patch, where #52958 checking with H->err should generally looks good?

@cjbj

This comment has been minimized.

Show comment
Hide comment
@cjbj

cjbj Jun 27, 2012

Contributor

Did you decide against changing OCITransRollback to an OCISessionEnd? Or will you create another pull request? That change seemed to fix pdo_oci_attr_autocommit_3.phpt and make the edge-case behavior the same as pdo_mysql.

Contributor

cjbj commented Jun 27, 2012

Did you decide against changing OCITransRollback to an OCISessionEnd? Or will you create another pull request? That change seemed to fix pdo_oci_attr_autocommit_3.phpt and make the edge-case behavior the same as pdo_mysql.

johannes and others added some commits Jun 27, 2012

Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix #62432 ReflectionMethod random corrupt memory on high concurrent

Conflicts:
	ext/date/php_date.c
	ext/fileinfo/fileinfo.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/reflection/php_reflection.c
	ext/spl/spl_array.c
	ext/spl/spl_directory.c
	ext/spl/spl_dllist.c
	ext/spl/spl_fixedarray.c
	ext/spl/spl_heap.c
	ext/spl/spl_iterators.c
	ext/spl/spl_observer.c
	ext/sqlite/sqlite.c
	ext/sqlite3/sqlite3.c
	ext/tidy/tidy.c
	ext/xmlreader/php_xmlreader.c
	ext/xmlwriter/php_xmlwriter.c
	ext/xsl/php_xsl.c
	ext/zip/php_zip.c
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Add json_last_error_msg() function
Anthony Ferrara
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix some lengths in crypt()

Conflicts:
	ext/standard/crypt.c
@php-pulls

This comment has been minimized.

Show comment
Hide comment
@php-pulls

php-pulls Jul 1, 2012

Comment on behalf of stas at php.net:

This pull does not look correct - too many unrelated patches. Please clean up and resubmit.

Comment on behalf of stas at php.net:

This pull does not look correct - too many unrelated patches. Please clean up and resubmit.

@php-pulls php-pulls closed this Jul 1, 2012

@smalyshev

This comment has been minimized.

Show comment
Hide comment
@smalyshev

smalyshev Jul 30, 2012

Contributor

Is this the correct name for the test? Seems to have nothing to do with IntlCalendar...

Is this the correct name for the test? Seems to have nothing to do with IntlCalendar...

This comment has been minimized.

Show comment
Hide comment
@cataphract

cataphract Jul 30, 2012

Contributor

Fixed that in 86ca788.

Contributor

cataphract replied Jul 30, 2012

Fixed that in 86ca788.

@smalyshev

This comment has been minimized.

Show comment
Hide comment
@smalyshev

smalyshev Jul 30, 2012

Contributor

This fails for me (ICU 4.2.1) - produces Warning: ResourceBundle::get(): Cannot load resource element 'DateTimePatterns'.

This fails for me (ICU 4.2.1) - produces Warning: ResourceBundle::get(): Cannot load resource element 'DateTimePatterns'.

This comment has been minimized.

Show comment
Hide comment
@cataphract

cataphract Jul 30, 2012

Contributor

It fails with ICU 4.4 too (only the pt_PT parts works, but in any case the pattern returned is different). I have no idea why. Even going back in ICU's history, the only difference I can find (in the relatively short time I dedicated to this) between what PHP does in this case and what ICU does to retrieve the patterns is that ICU calls ures_getByKeyWithFallback instead of ures_getByKey. I don't know the ICU ResourceBundle API or implementation very well, so it would take me quite a lot of effort to get to the bottom of this. I'll have this test be ICU 4.8+, since I originally tested this on that version.

Contributor

cataphract replied Jul 30, 2012

It fails with ICU 4.4 too (only the pt_PT parts works, but in any case the pattern returned is different). I have no idea why. Even going back in ICU's history, the only difference I can find (in the relatively short time I dedicated to this) between what PHP does in this case and what ICU does to retrieve the patterns is that ICU calls ures_getByKeyWithFallback instead of ures_getByKey. I don't know the ICU ResourceBundle API or implementation very well, so it would take me quite a lot of effort to get to the bottom of this. I'll have this test be ICU 4.8+, since I originally tested this on that version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment