php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,101 Commits 549 Branches 1,485 Tags
27b01cfcd7d26e4c6ae616733fbdae33ecbe494e
Commit Graph

74101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki 27b01cfcd7 Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 09:09:23 +09:00
Stanislav Malyshev 657d486013 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add fix for  #60560 into upgrading
 2013-06-28 14:01:53 -07:00
Stanislav Malyshev 103cf4c060 add fix for #60560 into upgrading 2013-06-28 14:01:25 -07:00
Stanislav Malyshev 4020ef8980 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
 2013-06-28 13:56:11 -07:00
Stanislav Malyshev e46beabe8f Merge branch 'bug61860' into PHP-5.4 
* bug61860:
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
 2013-06-28 13:54:57 -07:00
Adam Harvey 3becd3879f Add a __wakeup() method to SplFixedArray, thereby fixing serialising an 
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
 2013-06-28 13:50:33 -07:00
Arpad Ray e00ed6bc3f Update NEWS 2013-06-27 19:23:58 +01:00
Arpad Ray 70ae67b5da Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
 2013-06-27 19:12:46 +01:00
Arpad Ray ce8c023910 Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented 
When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.
 2013-06-27 19:05:23 +01:00
Arpad Ray 41565a239f Update NEWS 2013-06-27 12:49:16 +01:00
Arpad Ray 1e836cdd64 BC fix for PR 109 merge - create_sid() method in SessionHandler 
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.

Also added several more tests for this feature.
 2013-06-27 12:33:56 +01:00
Arpad Ray b66c14b0c8 Merge PR 109 - Add create_sid to session_set_save_handler and SessionHandler 
Allows user session handlers to create session IDs by adding an optional
7th argument to session_set_save_handler() and a create_sid() method
to SessionHandler.
 2013-06-27 12:29:44 +01:00
Xinchen Hui 60bbc78bde Update NEWS:w 2013-06-27 12:38:35 +08:00
Xinchen Hui c2cfc242c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-27 12:38:13 +08:00
Xinchen Hui fa8611c81e Fixed bug #65136 (RecursiveDirectoryIterator segfault) 2013-06-27 12:37:57 +08:00
Felipe Pena 402b3aaf56 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
 2013-06-26 19:16:26 -03:00
Felipe Pena 76866e0a2e - BFN 2013-06-26 19:16:13 -03:00
Felipe Pena 60dcc5851f - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com 2013-06-26 19:15:19 -03:00
Felipe Pena 02682f4169 - Reclassify bug 2013-06-26 15:15:37 -03:00
Felipe Pena efbf573e9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
 2013-06-26 15:08:51 -03:00
Felipe Pena 891bd46f3d - BFN 2013-06-26 15:08:33 -03:00
Felipe Pena cd176e0452 - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de 2013-06-26 15:06:27 -03:00
Felipe Pena aa31d7e1ef Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
 2013-06-26 13:50:43 -03:00
Felipe Pena 7e33b5d2fa - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com 2013-06-26 13:50:37 -03:00
Felipe Pena 32f11e4ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed test
 2013-06-26 13:36:41 -03:00
Felipe Pena f477ad22c2 - Fixed test 2013-06-26 13:36:36 -03:00
Andrey Hristov 781be5f1d7 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-06-26 16:50:08 +02:00
Andrey Hristov b34e8d2e3e add new test 2013-06-26 16:44:26 +02:00
Yasuo Ohgaki 8922c50ca4 Update NEWS 2013-06-26 16:31:34 +09:00
Yasuo Ohgaki 6c8cef3ca4 Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net 2013-06-26 16:17:57 +09:00
Felipe Pena 623386d799 - Fixed typo on condition 2013-06-25 21:53:20 -03:00
Felipe Pena b68c496175 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
 2013-06-25 21:44:03 -03:00
Felipe Pena 12b75e3d3e - BFN 2013-06-25 21:43:23 -03: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 e15ca39708 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-06-25 21:39:17 -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
Christopher Jones 91bd2de85c Update NEWS 2013-06-25 17:31:13 -07:00
Christopher Jones 12fdf8fb95 Update NEWS 2013-06-25 17:30:21 -07:00
Christopher Jones 99ab8a83af Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
 2013-06-25 17:28:12 -07:00
Christopher Jones 111b385afe Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
 2013-06-25 17:28:11 -07:00
Felipe Pena a689fde2bf - BFN 2013-06-25 21:19:56 -03:00
Felipe Pena f5bf90ef34 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
 2013-06-25 21:18:34 -03:00
Felipe Pena 04db57066d - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com 2013-06-25 21:18:09 -03:00
Felipe Pena 40c3601947 - BFN 2013-06-25 18:04:25 -03:00
Felipe Pena 2ab53f4b5e Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-06-25 18:01:46 -03:00
Felipe Pena b78f129a4a Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2013-06-25 18:01:40 -03:00
Felipe Pena adb116dd48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
 2013-06-25 18:00:42 -03:00
Felipe Pena 41b73e4cee - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com 2013-06-25 18:00:33 -03:00
Christopher Jones c3f4cc2e40 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
 2013-06-25 13:25:04 -07:00
Christopher Jones 3675b953f6 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
 2013-06-25 13:23:50 -07:00