php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,643 Commits 549 Branches 1,485 Tags
e52334fdbecc1eba1a800f70bcfdcdf02c70ebd1
Commit Graph

33602 Commits

Author SHA1 Message Date
Andrey Hristov e52334fdbe Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/mysqli_api.c
 2014-03-20 16:16:12 +02:00
Andrey Hristov 059bc99d94 don't replace with ?, just skip it 2014-03-20 12:11:16 +02:00
Yasuo Ohgaki e1fe76f28a Add default_charset handling 2014-03-20 10:50:32 +09:00
Christopher Jones 6c20b07190 OCI8: fix prototypes for oci_field_*(). They can take a column index or name. 2014-03-19 15:20:40 -07:00
Christopher Jones 8bdf272758 Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing 2014-03-19 14:10:56 -07:00
Andrey Hristov 62ab3af12f fix compilation error 2014-03-19 19:15:04 +02:00
Andrey Hristov 01c2ec03bc Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
 2014-03-19 18:54:39 +02:00
Andrey Hristov d63ed101ee Fix problem with mysqli_commt()/mysqli_rollback() 2014-03-19 18:32:19 +02:00
Yasuo Ohgaki 3ce980cf97 Merge branch 'pull-request/622' into PHP-5.6 
* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
 2014-03-19 17:29:24 +09:00
Anatol Belski ec11530620 remove obsolete comment 2014-03-19 06:35:58 +01:00
Anatol Belski 62f6c5853f Fixes to various stream cast on win64 
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
 2014-03-19 06:33:46 +01:00
Adam Harvey a6f7fca637 Merge accepted RFC https://wiki.php.net/rfc/timing_attack into 5.6. 2014-03-18 09:22:13 -07:00
Derick Rethans 415233d26d Merge branch 'PHP-5.5' into PHP-5.6 2014-03-18 15:02:25 +00:00
Derick Rethans 2dfb8fbdf4 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-18 14:48:56 +00:00
Derick Rethans b30304fb78 - Updated to version 2014.1 (2014a) 2014-03-18 14:48:55 +00:00
Andrey Hristov 39c53031e0 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-18 15:42:57 +02:00
Andrey Hristov 2b811a5aec Add a test 2014-03-18 15:42:38 +02:00
Mateusz Kocielski 888f467d63 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 09:53:58 +01:00
Mateusz Kocielski 156cc39e21 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 08:57:30 +01:00
Mateusz Kocielski 497b918e62 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed off-by-one in php_url_parse_ex

Conflicts:
	ext/standard/url.c
 2014-03-18 08:54:57 +01:00
Mateusz Kocielski 46566b78c9 Fixed off-by-one in php_url_parse_ex 
Change order of condition, previously pointer could be derefrenced before
bound check was done.
 2014-03-18 08:48:41 +01:00
Nikita Popov 42562ee913 Add support for PCRE marks 
If a MARK is set then it will be returned in the $matches array
unter key "MARK". If no MARK is used or passed, the key will not
be set.
 2014-03-17 22:32:40 +01:00
Daniel Lowrey 098b4e8f5a Merge branch 'pgsql-async' into PHP-5.6 
* pgsql-async:
  Support async pgsql connections and non-blocking queries
 2014-03-17 07:55:42 -06:00
Daniel Lowrey 2ee4c987e6 Support async pgsql connections and non-blocking queries 
- New functions (each accepts a pgsql $connection resource):

  . pg_connect_poll
  . pg_socket
  . pg_consume_input
  . pg_flush

- Modified functions

  The following functions now additionally return zero if the
  underlying socket is set to non-blocking mode and the send
  operation does not complete immediately. Previously these
  functions returned only boolean TRUE/FALSE and blocked
  execution while polling until all data was sent:

  . pg_send_execute
  . pg_send_prepare
  . pg_send_query
  . pg_send_query_params

- New constants

  Used with pg_connect() to initiate an asynchronous connection
  attempt:

  . PGSQL_CONNECT_ASYNC

  Used with pg_connection_status() to determine the current state
  of an async connection attempt:

  . PGSQL_CONNECTION_STARTED
  . PGSQL_CONNECTION_MADE
  . PGSQL_CONNECTION_AWAITING_RESPONSE
  . PGSQL_CONNECTION_AUTH_OK
  . PGSQL_CONNECTION_SSL_STARTUP
  . PGSQL_CONNECTION_SETENV

  Used with pg_connect_poll() to determine the result of an
  async connection attempt:

  . PGSQL_POLLING_FAILED
  . PGSQL_POLLING_READING
  . PGSQL_POLLING_WRITING
  . PGSQL_POLLING_OK
  . PGSQL_POLLING_ACTIVE

- Polling via returned pg_socket() stream

  pg_socket() returns a read-only socket stream that may be
  cast to a file descriptor for select (and similar) polling
  operations. Blocking behavior of the pgsql connection socket
  can be controlled by calling stream_set_blocking() on the
  stream returned by pg_socket().
 2014-03-17 06:31:15 -06:00
Rouven Weßling 2148a88b3d Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks. 2014-03-17 09:37:28 +01:00
Stanislav Malyshev 2499b6518c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66873: check if obj->src is set
 2014-03-17 01:20:09 -07:00
Stanislav Malyshev 66bf216c66 Fix bug #66873: check if obj->src is set 2014-03-17 01:19:02 -07:00
Anatol Belski f5ebea91b0 updated to oniguruma to 5.9.5 2014-03-15 17:56:04 +01:00
Remi Collet 89dc5924c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS
 2014-03-14 09:52:47 +01:00
Remi Collet e1d8c0a051 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
 2014-03-14 09:52:02 +01:00
Remi Collet 17f6391bf8 Fixed Bug #66833 Default digest algo is still MD5 
Switch to SHA1, which match internal openssl hardcoded algo.

In most case, won't even be noticed
- priority on user input (default_md)
- fallback on system config
- fallback on this default value

Recent system reject MD5 digest, noticed in bug36732.phpt failure.

While SHA1 is better than MD5, SHA256 is recommenced,
and defined as default algo in provided configuration on
recent system (Fedora 21, RHEL-7, ...). But the idea is to
keep in sync with openssl internal value for PHP internal value.
 2014-03-14 09:50:15 +01:00
Lior Kaplan f120463efe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Typo fix: sicret -> secret
 2014-03-13 12:41:48 +02:00
Lior Kaplan 356c442558 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Typo fix: sicret -> secret
 2014-03-13 12:40:14 +02:00
Michael Meyer 737c187013 Typo fix: sicret -> secret 2014-03-13 12:37:25 +02:00
Yasuo Ohgaki 973f379efc Remove unneeded test 2014-03-13 06:54:52 +09:00
Yasuo Ohgaki 6f0ad9ea12 Revert "Implement Bug #54649 Create session_serializer_name()" 
This reverts commit 678ec30655.

Conflicts:
	ext/session/tests/session_serializer_name_basic.phpt
 2014-03-13 06:32:49 +09:00
Yasuo Ohgaki 7dec5789fe Revert "Implemented Request #11100 (session_gc() function)." 
This reverts commit 54a42f0d0c.

Conflicts:
	ext/session/tests/session_gc_basic.phpt
 2014-03-13 06:30:32 +09:00
Anatol Belski 0bf5bce6ad Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  made libgd recognize the 9 version series
 2014-03-12 19:31:07 +01:00
Anatol Belski 3f049bcff2 made libgd recognize the 9 version series 2014-03-12 19:30:27 +01:00
Anatol Belski 75486555c2 fix include search 2014-03-12 19:25:20 +01:00
Remi Collet 44c0581e0c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
 2014-03-12 17:13:31 +01:00
Remi Collet 862c006da1 Fix bug #66887 imagescale - poor quality of scaled image 
Issue with signed char overflow.

Upstream fix:
https://bitbucket.org/libgd/gd-libgd/commits/4b86e06937bc5ff116be969137f8da9d1a7869d5
 2014-03-12 17:10:51 +01:00
Remi Collet 5bd13c5231 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66893i imagescale ignore method argument
 2014-03-12 15:36:08 +01:00
Remi Collet f2d5b2b6c6 Fixed Bug #66893i imagescale ignore method argument 
We also have our goto fail; bug.

Upstream fix for libgd
https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
 2014-03-12 15:35:42 +01:00
Nikita Popov 5e93a213f6 Add SKIPIF in GMP test 2014-03-12 14:17:08 +01:00
Nikita Popov e617dfbdf3 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-12 14:16:58 +01:00
Nikita Popov 06bbb657ad Fix hash_pbkdf2() with missing $length argument 
Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
 2014-03-12 14:16:18 +01:00
Remi Collet c8c1205d84 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #66890 imagescale segfault
 2014-03-12 13:46:51 +01:00
Remi Collet dada2f550f Fixed Bug #66890 imagescale segfault 
zend_parse_parameters "l" expect long, not int
 2014-03-12 13:44:58 +01:00
Yasuo Ohgaki ca927bb47e Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding 2014-03-12 17:54:22 +09:00